diff --git a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeItemRecipe.java b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeItemRecipe.java index c273a90..296585a 100644 --- a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeItemRecipe.java +++ b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeItemRecipe.java @@ -48,6 +48,9 @@ public record ForgeItemRecipe(Item primaryOutcomeItem, Item[] RequiredItems, int } public static RecipeSet GetAllValidRecipesFromContainer(ItemStack Pot, ItemStack Secondary){ + if(Pot == ItemStack.EMPTY && Secondary == ItemStack.EMPTY){ + return new RecipeSet(ForgedAlloyRecipe.RecipeMap.values().stream().toList(),ForgeItemRecipe.FORGE_ITEM_RECIPE_MAP.values().stream().toList()); + } List availableAlloyRecipes = ForgedAlloyRecipe.GetValidRecipesFromContainer(Pot); List ItemsToSearchWith = new ArrayList<>(); ItemsToSearchWith.add(Secondary.getItem()); diff --git a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeWorkbenchGUI.java b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeWorkbenchGUI.java index 2c3e428..7e73bd7 100644 --- a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeWorkbenchGUI.java +++ b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgeWorkbenchGUI.java @@ -72,7 +72,6 @@ public class ForgeWorkbenchGUI extends AbstractContainerMenu implements ModMenus } } ForgeWorkbenchGUI currentGUI = this; - currentGUI.Recipes = ForgeItemRecipe.GetAllValidRecipesFromContainer(currentGUI.getSlot(0).getItem(), currentGUI.getSlot(1).getItem()); this.customSlots.put(0, this.addSlot(new ResourceHandlerSlot(internal, this::setItemInSlot, 0, 8, 37) { private final int slot = 0; private int x = this.x; @@ -178,6 +177,7 @@ public class ForgeWorkbenchGUI extends AbstractContainerMenu implements ModMenus this.addDataSlots(this.data); } else this.data = null; + currentGUI.Recipes = ForgeItemRecipe.GetAllValidRecipesFromContainer(currentGUI.getSlot(0).getItem(), currentGUI.getSlot(1).getItem()); } public int getSyncedVariable(int index) { diff --git a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgedAlloyRecipe.java b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgedAlloyRecipe.java index 2017e01..2475996 100644 --- a/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgedAlloyRecipe.java +++ b/src/main/java/net/halbear/aotg/custom/blocks/Forge/ForgedAlloyRecipe.java @@ -66,7 +66,8 @@ public record ForgedAlloyRecipe(Item OutcomeItem, Item RequiredMetal1, Item Requ ItemStack AlloyMetal2 = potContents.getStackInSlot(2); availableRecipes = GetRecipesContainingMetals(AlloyMetal1.getItem(),AlloyMetal2.getItem()); availableRecipes.forEach(forgedAlloyRecipe -> { - if(Math.floor((float) AlloyMetal1.getCount() /(float)AlloyMetal2.getCount()) == Math.floor(forgedAlloyRecipe.AlloyRatio)) { + double Ratio = Math.floor((float) AlloyMetal1.getCount() /(float)AlloyMetal2.getCount()); + if( Ratio == Math.floor(forgedAlloyRecipe.AlloyRatio)) { ValidRecipes.add(forgedAlloyRecipe); } }); diff --git a/src/main/java/net/halbear/aotg/registries/ModBlocks.java b/src/main/java/net/halbear/aotg/registries/ModBlocks.java index ac6701b..254e44a 100644 --- a/src/main/java/net/halbear/aotg/registries/ModBlocks.java +++ b/src/main/java/net/halbear/aotg/registries/ModBlocks.java @@ -31,6 +31,27 @@ public class ModBlocks { .lightLevel(state -> 0) )); + public static final DeferredBlock SILVER_ORE = RegisterBlock("silver_ore", + properties -> new RockCoveredGrassBlock(properties.strength(1.5f) + .requiresCorrectToolForDrops() + .explosionResistance(6.0f) + .sound(SoundType.STONE) + .lightLevel(state -> 0) + )); + public static final DeferredBlock ZINC_ORE = RegisterBlock("zinc_ore", + properties -> new RockCoveredGrassBlock(properties.strength(1.5f) + .requiresCorrectToolForDrops() + .explosionResistance(6.0f) + .sound(SoundType.STONE) + .lightLevel(state -> 0) + )); + public static final DeferredBlock TIN_ORE = RegisterBlock("tin_ore", + properties -> new RockCoveredGrassBlock(properties.strength(1.5f) + .requiresCorrectToolForDrops() + .explosionResistance(6.0f) + .sound(SoundType.STONE) + .lightLevel(state -> 0) + )); public static final DeferredBlock OLIVE_LOG = RegisterBlock("olive_log", properties -> new RotatedPillarBlock(properties.strength(0.5f) diff --git a/src/main/java/net/halbear/aotg/registries/ModItems.java b/src/main/java/net/halbear/aotg/registries/ModItems.java index 760ada8..a13a9a1 100644 --- a/src/main/java/net/halbear/aotg/registries/ModItems.java +++ b/src/main/java/net/halbear/aotg/registries/ModItems.java @@ -17,6 +17,9 @@ import static net.halbear.aotg.registries.ModBlocks.*; public class ModItems { public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(AgeoftheGods.MODID); public static final DeferredItem LIMESTONE_ITEM = ITEMS.registerSimpleBlockItem("limestone_block", LIMESTONE_BLOCK); + public static final DeferredItem SILVER_ORE_ITEM = ITEMS.registerSimpleBlockItem("silver_ore", SILVER_ORE); + public static final DeferredItem TIN_ORE_ITEM = ITEMS.registerSimpleBlockItem("tin_ore", TIN_ORE); + public static final DeferredItem ZINC_ORE_ITEM = ITEMS.registerSimpleBlockItem("zinc_ore", ZINC_ORE); public static final DeferredItem SHALE_ITEM = ITEMS.registerSimpleBlockItem("shale_block", SHALE_BLOCK); public static final DeferredItem SHALE_GRASS_ITEM = ITEMS.registerSimpleBlockItem("shale_grass_block", SHALE_GRASS_BLOCK); public static final DeferredItem LIMESTONE_GRASS_ITEM = ITEMS.registerSimpleBlockItem("limestone_grass_block", LIMESTONE_GRASS_BLOCK); @@ -37,6 +40,9 @@ public class ModItems { public static final DeferredItem HEPATIZON_INGOT = RegisterItem("hepatizon_ingot", Item::new); public static final DeferredItem SILVER_INGOT = RegisterItem("silver_ingot", Item::new); public static final DeferredItem HARDENED_SLAG = RegisterItem("slag", Item::new); + public static final DeferredItem RAW_ZINC = RegisterItem("raw_zinc", Item::new); + public static final DeferredItem RAW_SILVER = RegisterItem("raw_silver", Item::new); + public static final DeferredItem RAW_TIN = RegisterItem("raw_tin", Item::new); public static final DeferredItem XIPHOS_SWORD = RegisterItem("xiphos", properties -> new Item(properties diff --git a/src/main/java/net/halbear/aotg/registries/ModTabs.java b/src/main/java/net/halbear/aotg/registries/ModTabs.java index 31086c5..8830477 100644 --- a/src/main/java/net/halbear/aotg/registries/ModTabs.java +++ b/src/main/java/net/halbear/aotg/registries/ModTabs.java @@ -39,16 +39,22 @@ public class ModTabs { output.accept(LIMESTONE_GRASS_ITEM.get()); output.accept(OLIVE_LEAVES_ITEM.get()); output.accept(OLIVE_LOG_ITEM.get()); - output.accept(XIPHOS_SWORD.get()); output.accept(ALLOY_FURNACE_ITEM.get()); output.accept(FORGE_WORKBENCH_ITEM.get()); + output.accept(TIN_ORE_ITEM.get()); + output.accept(RAW_TIN.get()); output.accept(TIN_INGOT.get()); + output.accept(ZINC_ORE_ITEM.get()); + output.accept(RAW_ZINC.get()); output.accept(ZINC_INGOT.get()); + output.accept(SILVER_ORE_ITEM.get()); + output.accept(RAW_SILVER.get()); output.accept(SILVER_INGOT.get()); output.accept(BRONZE_INGOT.get()); output.accept(ELECTRUM_INGOT.get()); output.accept(HEPATIZON_INGOT.get()); output.accept(ORICHALCUM_INGOT.get()); output.accept(HARDENED_SLAG.get()); + output.accept(XIPHOS_SWORD.get()); }).build()); } diff --git a/src/main/resources/assets/ageofthegods/Items/raw_silver.json b/src/main/resources/assets/ageofthegods/Items/raw_silver.json new file mode 100644 index 0000000..7b39fbb --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/raw_silver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:item/ores/raw_silver" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/raw_tin.json b/src/main/resources/assets/ageofthegods/Items/raw_tin.json new file mode 100644 index 0000000..b352944 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/raw_tin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:item/ores/raw_tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/raw_zinc.json b/src/main/resources/assets/ageofthegods/Items/raw_zinc.json new file mode 100644 index 0000000..4365dbd --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/raw_zinc.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:item/ores/raw_zinc" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/silver_ore.json b/src/main/resources/assets/ageofthegods/Items/silver_ore.json new file mode 100644 index 0000000..c59765d --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/ores/silver_ore1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/tin_ore.json b/src/main/resources/assets/ageofthegods/Items/tin_ore.json new file mode 100644 index 0000000..37a069c --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/ores/tin_ore1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/zinc_ore.json b/src/main/resources/assets/ageofthegods/Items/zinc_ore.json new file mode 100644 index 0000000..3554fe0 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/zinc_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/ores/zinc_ore1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/silver_ore.json b/src/main/resources/assets/ageofthegods/blockstates/silver_ore.json new file mode 100644 index 0000000..a0e6329 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/silver_ore.json @@ -0,0 +1,18 @@ +{ + "variants": { + "": [ + { + "model": "ageofthegods:block/ores/silver_ore1", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/silver_ore2", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/silver_ore3", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/silver_ore4", "weight": 1 + } + ] + } +} diff --git a/src/main/resources/assets/ageofthegods/blockstates/tin_ore.json b/src/main/resources/assets/ageofthegods/blockstates/tin_ore.json new file mode 100644 index 0000000..f56fcc9 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/tin_ore.json @@ -0,0 +1,12 @@ +{ + "variants": { + "": [ + { + "model": "ageofthegods:block/ores/tin_ore1", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/tin_ore2", "weight": 1 + } + ] + } +} diff --git a/src/main/resources/assets/ageofthegods/blockstates/zinc_ore.json b/src/main/resources/assets/ageofthegods/blockstates/zinc_ore.json new file mode 100644 index 0000000..a77a12f --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/zinc_ore.json @@ -0,0 +1,15 @@ +{ + "variants": { + "": [ + { + "model": "ageofthegods:block/ores/zinc_ore1", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/zinc_ore2", "weight": 1 + }, + { + "model": "ageofthegods:block/ores/zinc_ore3", "weight": 1 + } + ] + } +} diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore1.json b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore1.json new file mode 100644 index 0000000..6c45d66 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore1.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/silver_ore1" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore2.json b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore2.json new file mode 100644 index 0000000..8f669cc --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore2.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/silver_ore2" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore3.json b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore3.json new file mode 100644 index 0000000..4dba48c --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore3.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/silver_ore3" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore4.json b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore4.json new file mode 100644 index 0000000..6484e14 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/silver_ore4.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/silver_ore4" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore1.json b/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore1.json new file mode 100644 index 0000000..1e0fe30 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore1.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/tin_ore1" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore2.json b/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore2.json new file mode 100644 index 0000000..cabf759 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/tin_ore2.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/tin_ore2" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore1.json b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore1.json new file mode 100644 index 0000000..8b10774 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore1.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/zinc_ore" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore2.json b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore2.json new file mode 100644 index 0000000..279834c --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore2.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/zinc_ore2" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore3.json b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore3.json new file mode 100644 index 0000000..011ba00 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/ores/zinc_ore3.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/stone", + "all": "block/stone", + "overlay": "ageofthegods:block/ores/zinc_ore3" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/item/ores/raw_silver.json b/src/main/resources/assets/ageofthegods/models/item/ores/raw_silver.json new file mode 100644 index 0000000..b952ada --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/item/ores/raw_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ageofthegods:item/ores/raw_silver" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/item/ores/raw_tin.json b/src/main/resources/assets/ageofthegods/models/item/ores/raw_tin.json new file mode 100644 index 0000000..54dc9ad --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/item/ores/raw_tin.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ageofthegods:item/ores/raw_tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/item/ores/raw_zinc.json b/src/main/resources/assets/ageofthegods/models/item/ores/raw_zinc.json new file mode 100644 index 0000000..afdb19e --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/item/ores/raw_zinc.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ageofthegods:item/ores/raw_zinc" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore1.png b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore1.png new file mode 100644 index 0000000..de46097 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore1.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore2.png b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore2.png new file mode 100644 index 0000000..9d96c57 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore2.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore3.png b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore3.png new file mode 100644 index 0000000..8a63981 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore3.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore4.png b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore4.png new file mode 100644 index 0000000..88f1d76 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/silver_ore4.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore1.png b/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore1.png new file mode 100644 index 0000000..9cd0d8b Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore1.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore2.png b/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore2.png new file mode 100644 index 0000000..2922ce2 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/tin_ore2.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore.png b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore.png new file mode 100644 index 0000000..8c712aa Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore2.png b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore2.png new file mode 100644 index 0000000..7b94d19 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore2.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore3.png b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore3.png new file mode 100644 index 0000000..65de0d0 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/block/ores/zinc_ore3.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/item/ores/raw_silver.png b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_silver.png new file mode 100644 index 0000000..658358a Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_silver.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/item/ores/raw_tin.png b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_tin.png new file mode 100644 index 0000000..6fc309a Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_tin.png differ diff --git a/src/main/resources/assets/ageofthegods/textures/item/ores/raw_zinc.png b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_zinc.png new file mode 100644 index 0000000..df4bb11 Binary files /dev/null and b/src/main/resources/assets/ageofthegods/textures/item/ores/raw_zinc.png differ diff --git a/src/main/resources/data/ageofthegods/recipe/smelt_silver.json b/src/main/resources/data/ageofthegods/recipe/smelt_silver.json new file mode 100644 index 0000000..b3f10c5 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/smelt_silver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:smelting", + "group": "ores", + "category": "blocks", + "ingredient": "ageofthegods:raw_silver", + "result": "ageofthegods:silver_ingot" +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/smelt_tin.json b/src/main/resources/data/ageofthegods/recipe/smelt_tin.json new file mode 100644 index 0000000..68feb8e --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/smelt_tin.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:smelting", + "group": "ores", + "category": "blocks", + "ingredient": "ageofthegods:raw_tin", + "result": "ageofthegods:tin_ingot" +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/smelt_zinc.json b/src/main/resources/data/ageofthegods/recipe/smelt_zinc.json new file mode 100644 index 0000000..7b836f8 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/smelt_zinc.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:smelting", + "group": "ores", + "category": "blocks", + "ingredient": "ageofthegods:raw_zinc", + "result": "ageofthegods:zinc_ingot" +} \ No newline at end of file