diff --git a/gradle.properties b/gradle.properties index 19e5e2d..fda2a12 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.12.12 # Mod Properties - mod_version = 1.18.1-0.6.5 + mod_version = 1.18.1-0.9.9-unstable maven_group = ryantlg.GamerMod.mod archives_base_name = GamerMod diff --git a/src/main/java/net/arcmods/ryantlg/armourMaterials/notArmorMaterial.java b/src/main/java/net/arcmods/ryantlg/armourMaterials/notArmorMaterial.java new file mode 100644 index 0000000..d0d171d --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/armourMaterials/notArmorMaterial.java @@ -0,0 +1,59 @@ +package net.arcmods.ryantlg.armourMaterials; + +import net.arcmods.ryantlg.items.miscItems.fabricOfReality; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; + +public class notArmorMaterial implements ArmorMaterial{ + // {boots, leggings, chestplate, helmet} + private static final int[] BASE_DURABILITY = new int[] {1200, 1290, 1350, 1210}; + private static final int[] PROTECTION_VALUES = new int[] {15, 15, 15, 15}; + + // In which A is helmet, B chestplate, C leggings and D boots. + // For reference, Leather uses {1, 2, 3, 1}, and Diamond/Netherite {3, 6, 8, 3} + // {A, C, B, D} + + @Override + public int getDurability(EquipmentSlot slot) { + return BASE_DURABILITY[slot.getEntitySlotId()] * 10; + } + + @Override + public int getProtectionAmount(EquipmentSlot slot) { + return PROTECTION_VALUES[slot.getEntitySlotId()]; + } + + @Override + public int getEnchantability() { + return 100; + } + + @Override + public SoundEvent getEquipSound() { + return SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(fabricOfReality.FABRIC_OF_REALITY); + } + + @Override + public String getName() { + // Must be all lowercase + return "not"; + } + + @Override + public float getToughness() { + return 10.0F; + } + + @Override + public float getKnockbackResistance() { + return 10.0F; + } +} diff --git a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java index 6e3cd86..9e116f6 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.item.BlockItem; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -14,18 +15,18 @@ public class jeremiumBlocks { public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance(16)); public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5)); - public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).luminance(5)); + public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE)); public static void register() { Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_ore"), JEREMIUM_ORE); Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_ore"), new BlockItem(JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_block"), JEREMIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_block"), new BlockItem(JEREMIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_jeremium_ore"), DEEPSLATE_JEREMIUM_ORE); Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_jeremium_ore"), new BlockItem(DEEPSLATE_JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); + Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_block"), JEREMIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_block"), new BlockItem(JEREMIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); + gamermod.LOGGER.info("jeremiumBlocks loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java index ec3c0b7..d7a9f1d 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java @@ -6,19 +6,23 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.item.BlockItem; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class omniumBlocks { - public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool()); - public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool()); + public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool()); + public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool()); + public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE)); public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_ore"), new BlockItem(OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_block"), OMNIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_block"), new BlockItem(OMNIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_ore"), new BlockItem(OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_omnium_ore"), DEEPSLATE_OMNIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_omnium_ore"), new BlockItem(DEEPSLATE_OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_block"), OMNIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_block"), new BlockItem(OMNIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING))); gamermod.LOGGER.info("omniumBlocks loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java index 0dad434..d166a90 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.item.BlockItem; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; import net.minecraft.util.registry.Registry; @@ -14,11 +15,14 @@ import net.minecraft.util.registry.Registry; public class oriumBlocks { public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool()); public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool()); + public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE)); public static void register() { Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_ore"), ORIUM_ORE); Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_ore"), new BlockItem(ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); + Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_orium_ore"), DEEPSLATE_ORIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_orium_ore"), new BlockItem(DEEPSLATE_ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_block"), ORIUM_BLOCK); Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_block"), new BlockItem(ORIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); diff --git a/src/main/java/net/arcmods/ryantlg/gamermod.java b/src/main/java/net/arcmods/ryantlg/gamermod.java index 2114d11..5d89a61 100755 --- a/src/main/java/net/arcmods/ryantlg/gamermod.java +++ b/src/main/java/net/arcmods/ryantlg/gamermod.java @@ -6,6 +6,7 @@ import net.arcmods.ryantlg.blocks.jeremiumBlocks; import net.arcmods.ryantlg.blocks.omniumBlocks; import net.arcmods.ryantlg.blocks.oriumBlocks; import net.arcmods.ryantlg.items.armour.jeremiumArmour; +import net.arcmods.ryantlg.items.armour.notArmour; import net.arcmods.ryantlg.items.armour.omniumArmour; import net.arcmods.ryantlg.items.armour.oriumArmour; import net.arcmods.ryantlg.items.itemsByCrop.weemItems; @@ -104,6 +105,9 @@ public class gamermod implements ModInitializer { jeremiumTools.register(); JeremiumOreGen.register(); + notArmour.register(); + } + //fight me } \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java new file mode 100644 index 0000000..cddaf16 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java @@ -0,0 +1,31 @@ +package net.arcmods.ryantlg.items.armour; + +import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.armourMaterials.notArmorMaterial; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; +import net.minecraft.util.registry.Registry; + +public class notArmour { + + public static final ArmorMaterial OMNIUM_ARMOR_MATERIAL = new notArmorMaterial(); + public static final Item NOT_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + + public static void register() { + + Registry.register(Registry.ITEM, new Identifier("gamermod", "not_helmet"), NOT_HELMET); + Registry.register(Registry.ITEM, new Identifier("gamermod", "not_chestplate"), NOT_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gamermod", "not_leggings"), NOT_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gamermod", "not_boots"), NOT_BOOTS); + + gamermod.LOGGER.info("notArmour loaded"); + } + +} diff --git a/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json b/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json new file mode 100644 index 0000000..9dee53e --- /dev/null +++ b/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gamermod:block/deepslate_omnium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json b/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json new file mode 100644 index 0000000..5922088 --- /dev/null +++ b/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gamermod:block/deepslate_orium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/lang/en_us.json b/src/main/resources/assets/gamermod/lang/en_us.json index 98cefa3..e1e44c1 100755 --- a/src/main/resources/assets/gamermod/lang/en_us.json +++ b/src/main/resources/assets/gamermod/lang/en_us.json @@ -65,6 +65,9 @@ "item.gamermod.jeremium_hoe": "Jeremium Hoe", "item.gamermod.jeremium_shovel": "Jeremium Shovel", "item.gamermod.jeremium_pickaxe": "Jeremium Pickaxe", - "item.gamermod.jeremium_sword.tooltip": "Kinda heavy" + "item.gamermod.jeremium_sword.tooltip": "Kinda heavy", + "block.gamermod.deepslate_jeremium_ore": "Deepslate Jeremium Ore", + "block.gamermod.deepslate_omnium_ore": "Deepslate Omnium Ore", + "block.gamermod.deepslate_orium_ore": "Deepslate Orium Ore" } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json b/src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json new file mode 100644 index 0000000..4b99ddf --- /dev/null +++ b/src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "gamermod:block/deepslate_omnium_ore" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json b/src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json new file mode 100644 index 0000000..3f5c69b --- /dev/null +++ b/src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "gamermod:block/deepslate_orium_ore" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json b/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json new file mode 100644 index 0000000..dadf116 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gamermod:block/deepslate_omnium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json b/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json new file mode 100644 index 0000000..745fbb8 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gamermod:block/deepslate_orium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_boots.json b/src/main/resources/assets/gamermod/models/item/not_boots.json new file mode 100644 index 0000000..94eaa02 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/not_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gamermod:item/" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_chestplate.json b/src/main/resources/assets/gamermod/models/item/not_chestplate.json new file mode 100644 index 0000000..94eaa02 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/not_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gamermod:item/" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_helmet.json b/src/main/resources/assets/gamermod/models/item/not_helmet.json new file mode 100644 index 0000000..94eaa02 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/not_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gamermod:item/" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_leggings.json b/src/main/resources/assets/gamermod/models/item/not_leggings.json new file mode 100644 index 0000000..94eaa02 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/not_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gamermod:item/" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/textures/block/deepslate_omnium_ore.png b/src/main/resources/assets/gamermod/textures/block/deepslate_omnium_ore.png new file mode 100644 index 0000000..54cd827 Binary files /dev/null and b/src/main/resources/assets/gamermod/textures/block/deepslate_omnium_ore.png differ diff --git a/src/main/resources/assets/gamermod/textures/block/deepslate_orium_ore.png b/src/main/resources/assets/gamermod/textures/block/deepslate_orium_ore.png new file mode 100644 index 0000000..e90a6e3 Binary files /dev/null and b/src/main/resources/assets/gamermod/textures/block/deepslate_orium_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/not_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/not_layer_1.png new file mode 100644 index 0000000..24dcd8f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/not_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/not_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/not_layer_2.png new file mode 100644 index 0000000..306197b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/not_layer_2.png differ diff --git a/src/main/resources/data/fabric/tags/items/axes.json b/src/main/resources/data/fabric/tags/items/axes.json index ebdc6a5..71a51cd 100755 --- a/src/main/resources/data/fabric/tags/items/axes.json +++ b/src/main/resources/data/fabric/tags/items/axes.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gamermod:omnium_axe", - "gamermod:orium_axe" + "gamermod:orium_axe", + "gamermod:jeremium_axe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/hoes.json b/src/main/resources/data/fabric/tags/items/hoes.json index 4b6b7c8..1eba777 100755 --- a/src/main/resources/data/fabric/tags/items/hoes.json +++ b/src/main/resources/data/fabric/tags/items/hoes.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gamermod:omnium_hoe", - "gamermod:orium_hoe" + "gamermod:orium_hoe", + "gamermod:jeremium_hoe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/pickaxes.json b/src/main/resources/data/fabric/tags/items/pickaxes.json index 02101e3..90284c6 100755 --- a/src/main/resources/data/fabric/tags/items/pickaxes.json +++ b/src/main/resources/data/fabric/tags/items/pickaxes.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gamermod:omnium_pickaxe", - "gamermod:orium_pickaxe" + "gamermod:orium_pickaxe", + "gamermod:jeremium_pickaxe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/shovels.json b/src/main/resources/data/fabric/tags/items/shovels.json index 811a0bf..2eb84e3 100755 --- a/src/main/resources/data/fabric/tags/items/shovels.json +++ b/src/main/resources/data/fabric/tags/items/shovels.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gamermod:omnium_shovel", - "gamermod:orium_shovel" + "gamermod:orium_shovel", + "gamermod:jeremium_shovel" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/swords.json b/src/main/resources/data/fabric/tags/items/swords.json index f476828..72064f1 100755 --- a/src/main/resources/data/fabric/tags/items/swords.json +++ b/src/main/resources/data/fabric/tags/items/swords.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gamermod:omnium_sword", - "gamermod:orium_sword" + "gamermod:orium_sword", + "gamermod:jeremium_sword" ] } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json new file mode 100755 index 0000000..c5f2f65 --- /dev/null +++ b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gamermod:deepslate_jeremium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gamermod:raw_jeremium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json new file mode 100755 index 0000000..ab93702 --- /dev/null +++ b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gamermod:deepslate_omnium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gamermod:raw_omnium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json new file mode 100755 index 0000000..c360405 --- /dev/null +++ b/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gamermod:deepslate_orium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gamermod:raw_orium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json new file mode 100755 index 0000000..4b8d5e6 --- /dev/null +++ b/src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gamermod:jeremium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gamermod:raw_jeremium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json index 758145a..02d35fa 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json +++ b/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json @@ -1,21 +1,45 @@ { + "type": "minecraft:block", "pools": [ { "rolls": 1, + "bonus_rolls": 0, "entries": [ { - "type": "minecraft:item", - "name": "gamermod:raw_omnium", - "functions": [ + "type": "minecraft:alternatives", + "children": [ { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ], - "conditions": [ + "type": "minecraft:item", + "name": "gamermod:omnium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, { - "condition": "minecraft:survives_explosion" + "type": "minecraft:item", + "name": "gamermod:raw_omnium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] } ] } diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json b/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json index 98c53c3..160b816 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json +++ b/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json @@ -1,21 +1,45 @@ { + "type": "minecraft:block", "pools": [ { "rolls": 1, + "bonus_rolls": 0, "entries": [ { - "type": "minecraft:item", - "name": "gamermod:raw_orium", - "functions": [ + "type": "minecraft:alternatives", + "children": [ { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ], - "conditions": [ + "type": "minecraft:item", + "name": "gamermod:orium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, { - "condition": "minecraft:survives_explosion" + "type": "minecraft:item", + "name": "gamermod:raw_orium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] } ] } diff --git a/src/main/resources/data/gamermod/recipes/jeremium_block.json b/src/main/resources/data/gamermod/recipes/jeremium_block.json new file mode 100755 index 0000000..825e2d4 --- /dev/null +++ b/src/main/resources/data/gamermod/recipes/jeremium_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FFF", + "FFF", + "FFF" + ], + "key": { + "F": { + "item": "gamermod:jeremium_ingot" + } + }, + "result": { + "item": "gamermod:jeremium_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot.json b/src/main/resources/data/gamermod/recipes/jeremium_ingot.json new file mode 100755 index 0000000..ce2f0b3 --- /dev/null +++ b/src/main/resources/data/gamermod/recipes/jeremium_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "gamermod:jeremium_block" + } + ], + "result": { + "item": "gamermod:jeremium_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json b/src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json new file mode 100755 index 0000000..3b1a9de --- /dev/null +++ b/src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "gamermod:raw_jeremium" + }, + "result": "gamermod:jeremium_ingot", + "experience": 1.0, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json b/src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json new file mode 100755 index 0000000..72e8002 --- /dev/null +++ b/src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "gamermod:raw_jeremium" + }, + "result": "gamermod:jeremium_ingot", + "experience": 1, + "cookingtime": 250 +} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/tags/blocks/ores.json b/src/main/resources/data/gamermod/tags/blocks/ores.json index 068545f..7022232 100755 --- a/src/main/resources/data/gamermod/tags/blocks/ores.json +++ b/src/main/resources/data/gamermod/tags/blocks/ores.json @@ -4,6 +4,8 @@ "gamermod:omnium_ore", "gamermod:orium_ore", "gamermod:jeremium_ore", - "gamermod:deepslate_jeremium_ore" + "gamermod:deepslate_jeremium_ore", + "gamermod:deepslate_omnium_ore", + "gamermod:deepslate_orium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index b929612..83c8438 100755 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -7,6 +7,8 @@ "gamermod:orium_ore", "gamermod:jeremium_ore", "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block" + "gamermod:jeremium_block", + "gamermod:deepslate_omnium_ore", + "gamermod:deepslate_orium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index b929612..83c8438 100755 --- a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -7,6 +7,8 @@ "gamermod:orium_ore", "gamermod:jeremium_ore", "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block" + "gamermod:jeremium_block", + "gamermod:deepslate_omnium_ore", + "gamermod:deepslate_orium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json index b929612..83c8438 100755 --- a/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json @@ -7,6 +7,8 @@ "gamermod:orium_ore", "gamermod:jeremium_ore", "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block" + "gamermod:jeremium_block", + "gamermod:deepslate_omnium_ore", + "gamermod:deepslate_orium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index de25d7a..51e3228 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,12 +26,12 @@ ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.12.12", "fabric": "*", "minecraft": "1.18.1", "java": ">=17" }, "suggests": { - "darkevolution": "*" + "darkevolution": "1.18.1-x" } }