diff --git a/CREDITS.md b/CREDITS.md index 28e6a33..1d2a241 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -12,12 +12,16 @@ - [ConnorTron110](https://github.com/ConnorTron110) - Discord: `ConnorTron110#0110` +- [TeenagedLime3](https://github.com/TeenagedLime3) + - Discord `TeenagedLime3#4529` + - Youtube `https://www.youtube.com/channel/UCov5D-LLTM9nh2WPz5_LqOA` + - Twitch `https://twitch.tv/teenagedlime3` ## Assets - Comso - Discord: `Comso#1828` - - Created: the Raw Tin, Tin Ore, and Tin Ingot textures + - Created: the Raw Tin, Steel Blend, Steel Ingot, Damascus Ingot, Tin Ore, and Tin Ingot textures ## Miscellaneous diff --git a/README.md b/README.md index 93c291f..bd72cf5 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ This uses the Forge modding API and targets Minecraft 1.18. - Bronze Ingot, Block Of Bronze, Bronze Nugget, Bronze Tools (Sword, Pickaxe, Shovel, Axe and Hoe) and Bronze Armor - Flint Tools (Sword, Pickaxe, Shovel, Axe, Hoe and Dagger) - Jumprasher +- Steel: Ingot and Nugget (used in crafting of Damascus) +- Damascus: Damascus Ingot, Damascus ## Modifications diff --git a/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java b/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java new file mode 100644 index 0000000..4a63d86 --- /dev/null +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java @@ -0,0 +1,28 @@ +package io.github.darealturtywurty.ancientology.common.items; + +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import javax.annotation.Nullable; +import java.util.List; + +public class MjolnirItem extends Item { + public MjolnirItem(Properties pProperties) { + super(pProperties); + } + + @Override + public void appendHoverText(ItemStack pstack, @Nullable Level plevel, + List pTooltipComponents, TooltipFlag pIsAdvanced) { + if (Screen.hasShiftDown()) { + pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.mjolnir")); + } else { + pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.mjolnir.shift")); + } + } +} \ No newline at end of file diff --git a/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java b/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java new file mode 100644 index 0000000..a7b21f2 --- /dev/null +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java @@ -0,0 +1,28 @@ +package io.github.darealturtywurty.ancientology.common.items; + +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import javax.annotation.Nullable; +import java.util.List; + +public class SchimitarItem extends Item { + public SchimitarItem(Properties pProperties) { + super(pProperties); + } + + @Override + public void appendHoverText(ItemStack pstack, @Nullable Level plevel, + List pTooltipComponents, TooltipFlag pIsAdvanced) { + if (Screen.hasShiftDown()) { + pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.schimitar")); + } else { + pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.schimitar.shift")); + } + } +} \ No newline at end of file diff --git a/src/main/java/io/github/darealturtywurty/ancientology/core/init/ItemInit.java b/src/main/java/io/github/darealturtywurty/ancientology/core/init/ItemInit.java index 2094be7..8c069f0 100644 --- a/src/main/java/io/github/darealturtywurty/ancientology/core/init/ItemInit.java +++ b/src/main/java/io/github/darealturtywurty/ancientology/core/init/ItemInit.java @@ -2,20 +2,13 @@ import io.github.darealturtywurty.ancientology.Ancientology; import io.github.darealturtywurty.ancientology.common.items.ForbiddenFruitItem; +import io.github.darealturtywurty.ancientology.common.items.MjolnirItem; +import io.github.darealturtywurty.ancientology.common.items.SchimitarItem; import io.github.darealturtywurty.ancientology.core.materials.ArmorMaterials; import io.github.darealturtywurty.ancientology.core.materials.ToolMaterials; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DyeableArmorItem; -import net.minecraft.world.item.HoeItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.*; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -41,8 +34,8 @@ public final class ItemInit { */ // Resources - public static final RegistryObject RAW_TIN = ITEMS.register("raw_tin", () -> new Item(defaultProperties())); - + public static final RegistryObject RAW_TIN = ITEMS.register("raw_tin", + () -> new Item(defaultProperties())); public static final RegistryObject TIN_INGOT = ITEMS.register("tin_ingot", () -> new Item(defaultProperties())); public static final RegistryObject TIN_NUGGET = ITEMS.register("tin_nugget", @@ -53,6 +46,14 @@ public final class ItemInit { () -> new Item(defaultProperties())); public static final RegistryObject BRONZE_NUGGET = ITEMS.register("bronze_nugget", () -> new Item(defaultProperties())); + public static final RegistryObject STEEL_INGOT = ITEMS.register("steel_ingot", + () -> new Item(defaultProperties())); + public static final RegistryObject STEEL_NUGGET = ITEMS.register("steel_nugget", + () -> new Item(defaultProperties())); + public static final RegistryObject STEEL_BLEND = ITEMS.register("steel_blend", + () -> new Item(defaultProperties())); + public static final RegistryObject DAMASCUS_INGOT = ITEMS.register("damascus_ingot", //TODO THE DAMASCUS STEEL INGOT IS A PLACEHOLDER TEXTURE, COMSO SHOULD PROVIDE THE ACTUALL TEXTURE ON THE 13/02/22 + () -> new Item(defaultProperties())); // Tools // TODO: Add Spears and Arrows public static final RegistryObject FLINT_DAGGER = ITEMS.register("flint_dagger", @@ -106,6 +107,16 @@ public final class ItemInit { () -> new ShovelItem(ToolMaterials.BRONZE, 1.5f, -3.0f, defaultProperties())); public static final RegistryObject BRONZE_HOE = ITEMS.register("bronze_hoe", () -> new HoeItem(ToolMaterials.BRONZE, -1, -2.0f, defaultProperties())); + + public static final RegistryObject DAMASCUS_SWORD = ITEMS.register("damascus_sword", + () -> new SwordItem(ToolMaterials.DAMASCUS, 3, -2.4f, defaultProperties())); + public static final RegistryObject MJOLNIR = ITEMS.register("mjolnir", + () -> new MjolnirItem(defaultProperties())); + public static final RegistryObject DAMASCUS_AXE = ITEMS.register("damascus_axe", + () -> new AxeItem(ToolMaterials.DAMASCUS, 7, -3.2f, defaultProperties())); + public static final RegistryObject SCIMITAR = ITEMS.register("scimitar", + () -> new SchimitarItem(defaultProperties())); + // Armor public static final RegistryObject BRONZE_HELMET = ITEMS.register("bronze_helmet", () -> new ArmorItem(ArmorMaterials.BRONZE, EquipmentSlot.HEAD, defaultProperties())); diff --git a/src/main/java/io/github/darealturtywurty/ancientology/core/materials/ToolMaterials.java b/src/main/java/io/github/darealturtywurty/ancientology/core/materials/ToolMaterials.java index 90a95f8..f4bfc96 100644 --- a/src/main/java/io/github/darealturtywurty/ancientology/core/materials/ToolMaterials.java +++ b/src/main/java/io/github/darealturtywurty/ancientology/core/materials/ToolMaterials.java @@ -10,7 +10,8 @@ public enum ToolMaterials implements Tier { FLINT(0, 59, 2.0F, 0.0F, 15, () -> Ingredient.of(Items.FLINT)), BONE(0, 59, 2.0F, 0.0F, 15, () -> Ingredient.of(Items.BONE)), - BRONZE(1, 131, 4.0F, 1.0F, 5, () -> Ingredient.of(ItemInit.BRONZE_INGOT.get())); + BRONZE(1, 131, 4.0F, 1.0F, 5, () -> Ingredient.of(ItemInit.BRONZE_INGOT.get())), + DAMASCUS(1, 131, 4.0F, 1.0F, 5, () -> Ingredient.of(ItemInit.BRONZE_INGOT.get())); private final int level; private final int uses; diff --git a/src/main/java/io/github/darealturtywurty/ancientology/core/util/datastructures/SimpleContainer.java b/src/main/java/io/github/darealturtywurty/ancientology/core/util/datastructures/SimpleContainer.java index 4f39afe..d81ee3f 100644 --- a/src/main/java/io/github/darealturtywurty/ancientology/core/util/datastructures/SimpleContainer.java +++ b/src/main/java/io/github/darealturtywurty/ancientology/core/util/datastructures/SimpleContainer.java @@ -1,13 +1,6 @@ package io.github.darealturtywurty.ancientology.core.util.datastructures; -import java.util.Arrays; -import java.util.List; -import java.util.stream.IntStream; - -import javax.annotation.Nullable; - import com.google.common.collect.Lists; - import io.github.darealturtywurty.ancientology.core.util.interfaces.OnChangedListener; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -21,6 +14,11 @@ import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.stream.IntStream; + public class SimpleContainer implements Container, IItemHandler, WorldlyContainer, INBTSerializable { protected final ItemStack[] contents; private final int stackLimit; @@ -108,11 +106,12 @@ public IItemHandler getItemHandlerSided(Direction side) { return new SidedInvWrapper(this, side); } - /** + /* * Get the array of {@link net.minecraft.item.ItemStack} inside this inventory. * * @return The items in this inventory. */ + public ItemStack[] getItemStacks() { return this.contents; } diff --git a/src/main/resources/assets/ancientology/lang/en_us.json b/src/main/resources/assets/ancientology/lang/en_us.json index 503401a..b66092f 100644 --- a/src/main/resources/assets/ancientology/lang/en_us.json +++ b/src/main/resources/assets/ancientology/lang/en_us.json @@ -1,43 +1,66 @@ { + //These errors don't affect the launching of the mod, if it causes an error for you open an issue in the github. + + //Items + "item.ancientology.bronze_ingot": "Bronze Ingot", + "item.ancientology.bronze_nugget": "Bronze Nugget", + "item.ancientology.copper_nugget": "Copper Nugget", + "item.ancientology.tin_ingot": "Tin Ingot", + "item.ancientology.raw_tin": "Raw Tin", + "item.ancientology.tin_nugget": "Tin Nugget", + "item.ancientology.steel_nugget": "Steel Nugget", + "item.ancientology.steel_ingot": "Steel Ingot", + "item.ancientology.steel_blend": "Steel Blend", + "item.ancientology.damascus_ingot": "Damascus Ingot", + "item.ancientology.forbidden_fruit": "Forbidden Fruit", + //Blocks "block.ancientology.bronze_block": "Block of Bronze", + "block.ancientology.tin_block": "Block of Tin", "block.ancientology.deepslate_tin_ore": "Deepslate Tin Ore", - "block.ancientology.jumprasher": "Jumprasher", "block.ancientology.life_leaves": "Leaves of Life", "block.ancientology.life_log": "Log of Life", "block.ancientology.life_planks": "Planks of Life", "block.ancientology.life_sapling": "Sapling of Life", - "block.ancientology.tin_block": "Block of Tin", - "item.ancientology.bone_axe": "Bone Axe", - "item.ancientology.bone_boots": "Bone Boots", - "item.ancientology.bone_chestplate": "Bone Chestplate", - "item.ancientology.bone_dagger": "Bone Dagger", + "block.ancientology.jumprasher": "Jumprasher", + //Armor + "item.ancientology.bronze_helmet": "Bronze Helmet", + "item.ancientology.bronze_chestplate": "Bronze Chestplate", + "item.ancientology.bronze_leggings": "Bronze Leggings", + "item.ancientology.bronze_boots": "Bronze Boots", + "item.ancientology.bone_helmet": "Bone Helmet", - "item.ancientology.bone_hoe": "Bone Hoe", + "item.ancientology.bone_chestplate": "Bone Chestplate", "item.ancientology.bone_leggings": "Bone Leggings", - "item.ancientology.bone_pickaxe": "Bone Pickaxe", - "item.ancientology.bone_shovel": "Bone Shovel", + "item.ancientology.bone_boots": "Bone Boots", + //Tools "item.ancientology.bronze_axe": "Bronze Axe", - "item.ancientology.bronze_boots": "Bronze Boots", - "item.ancientology.bronze_chestplate": "Bronze Chestplate", - "item.ancientology.bronze_helmet": "Bronze Helmet", - "item.ancientology.bronze_hoe": "Bronze Hoe", - "item.ancientology.bronze_ingot": "Bronze Ingot", - "item.ancientology.bronze_leggings": "Bronze Leggings", - "item.ancientology.bronze_nugget": "Bronze Nugget", "item.ancientology.bronze_pickaxe": "Bronze Pickaxe", "item.ancientology.bronze_shovel": "Bronze Shovel", + "item.ancientology.bronze_hoe": "Bronze Hoe", "item.ancientology.bronze_sword": "Bronze Sword", - "item.ancientology.copper_nugget": "Copper Nugget", + + "item.ancientology.bone_axe": "Bone Axe", + "item.ancientology.bone_pickaxe": "Bone Pickaxe", + "item.ancientology.bone_shovel": "Bone Shovel", + "item.ancientology.bone_hoe": "Bone Hoe", + "item.ancientology.bone_dagger": "Bone Dagger", + "item.ancientology.flint_axe": "Flint Axe", - "item.ancientology.flint_dagger": "Flint Dagger", - "item.ancientology.flint_hoe": "Flint Hoe", "item.ancientology.flint_pickaxe": "Flint Pickaxe", "item.ancientology.flint_shovel": "Flint Shovel", - "item.ancientology.raw_tin": "Raw Tin", - "item.ancientology.tin_ingot": "Tin Ingot", - "item.ancientology.tin_nugget": "Tin Nugget", - "itemGroup.ancientology": "Ancientology", - "item.ancientology.forbidden_fruit": "Forbidden Fruit", + "item.ancientology.flint_hoe": "Flint Hoe", + "item.ancientology.flint_dagger": "Flint Dagger", + + "item.ancientology.damascus_sword": "Damascus Sword", + "item.ancientology.mjolnir": "Mjolnir", + "item.ancientology.damascus_axe": "Damascus Axe", + "item.ancientology.scimitar": "Scimitar", + //Tooltips + "tooltip.ancientology.mjolnir.shift": "Hold §3SHIFT§3 §ffor more information", + "tooltip.ancientology.mjolnir": "The hammer of the god thor in Norse mythology (a weapon)", + "tooltip.ancientology.schimitar.shift": "Hold §3SHIFT§3 §ffor more information", + "tooltip.ancientology.schimitar": "A is a single-edged §6sword§6, §fassociated with Middle Eastern, South Asian or North African Cultures", + //Messages "msg.ancientology.fruit_arrow_rain": "Heavenly arrows have come from above.", "msg.ancientology.fruit_chance": "God has given you a second chance. Do not waste it.", "msg.ancientology.fruit_give_bad_effect": "Sickness has befallen upon you. Don't disobey God.", @@ -45,5 +68,7 @@ "msg.ancientology.fruit_give_item": "You disobeyed God. You were not disappointed.", "msg.ancientology.fruit_hunger": "God has stricken you with irony.", "msg.ancientology.fruit_lightning": "You've invoked the wrath of God.", - "msg.ancientology.fruit_nether": "God has banished you to Hell." -} + "msg.ancientology.fruit_nether": "God has banished you to Hell.", + //Misc + "itemGroup.ancientology": "Ancientology" +} \ No newline at end of file diff --git a/src/main/resources/assets/ancientology/models/item/damascus_axe.json b/src/main/resources/assets/ancientology/models/item/damascus_axe.json new file mode 100644 index 0000000..04162ec --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/damascus_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "ancientology:item/damascus_axe" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/damascus_ingot.json b/src/main/resources/assets/ancientology/models/item/damascus_ingot.json new file mode 100644 index 0000000..8fb711d --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/damascus_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ancientology:item/damascus_ingot" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/damascus_sword.json b/src/main/resources/assets/ancientology/models/item/damascus_sword.json new file mode 100644 index 0000000..777a363 --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/damascus_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "ancientology:item/damascus_sword" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/mjolnir.json b/src/main/resources/assets/ancientology/models/item/mjolnir.json new file mode 100644 index 0000000..71a7a23 --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/mjolnir.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "ancientology:item/mjolnir" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/scimitar.json b/src/main/resources/assets/ancientology/models/item/scimitar.json new file mode 100644 index 0000000..56eff43 --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/scimitar.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "ancientology:item/scimitar" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/steel_blend.json b/src/main/resources/assets/ancientology/models/item/steel_blend.json new file mode 100644 index 0000000..cbc9925 --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/steel_blend.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ancientology:item/steel_blend" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/steel_ingot.json b/src/main/resources/assets/ancientology/models/item/steel_ingot.json new file mode 100644 index 0000000..33e2f02 --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ancientology:item/steel_ingot" + } +} diff --git a/src/main/resources/assets/ancientology/models/item/steel_nugget.json b/src/main/resources/assets/ancientology/models/item/steel_nugget.json new file mode 100644 index 0000000..ad20cca --- /dev/null +++ b/src/main/resources/assets/ancientology/models/item/steel_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ancientology:item/steel_nugget" + } +} diff --git a/src/main/resources/assets/ancientology/textures/block/steel_block.png b/src/main/resources/assets/ancientology/textures/block/steel_block.png new file mode 100644 index 0000000..fbacbf1 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/block/steel_block.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/damascus_axe.png b/src/main/resources/assets/ancientology/textures/item/damascus_axe.png new file mode 100644 index 0000000..2684678 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/damascus_axe.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/damascus_ingot.png b/src/main/resources/assets/ancientology/textures/item/damascus_ingot.png new file mode 100644 index 0000000..2413eca Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/damascus_ingot.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/damascus_sword.png b/src/main/resources/assets/ancientology/textures/item/damascus_sword.png new file mode 100644 index 0000000..c6b724f Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/damascus_sword.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/img.png b/src/main/resources/assets/ancientology/textures/item/img.png new file mode 100644 index 0000000..091d0c0 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/img.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/img_1.png b/src/main/resources/assets/ancientology/textures/item/img_1.png new file mode 100644 index 0000000..091d0c0 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/img_1.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/mjolnir.png b/src/main/resources/assets/ancientology/textures/item/mjolnir.png new file mode 100644 index 0000000..0d83914 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/mjolnir.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/scimitar.png b/src/main/resources/assets/ancientology/textures/item/scimitar.png new file mode 100644 index 0000000..e4d0d5f Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/scimitar.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/steel_blend.png b/src/main/resources/assets/ancientology/textures/item/steel_blend.png new file mode 100644 index 0000000..b3c4c01 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/steel_blend.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/steel_block.png b/src/main/resources/assets/ancientology/textures/item/steel_block.png new file mode 100644 index 0000000..fbacbf1 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/steel_block.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/steel_ingot.png b/src/main/resources/assets/ancientology/textures/item/steel_ingot.png new file mode 100644 index 0000000..eeead0e Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/steel_ingot.png differ diff --git a/src/main/resources/assets/ancientology/textures/item/steel_nugget.png b/src/main/resources/assets/ancientology/textures/item/steel_nugget.png new file mode 100644 index 0000000..ff54390 Binary files /dev/null and b/src/main/resources/assets/ancientology/textures/item/steel_nugget.png differ diff --git a/src/main/resources/data/forge/tags/items/bone.json b/src/main/resources/data/forge/tags/items/bone.json new file mode 100644 index 0000000..690e744 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/bone.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "ancientology:bone_arrow", + "ancientology:bone_axe", + "ancientology:bone_boots", + "ancientology:bone_chestplate", + "ancientology:bone_dagger", + "ancientology:bone_helmet", + "ancientology:bone_hoe", + "ancientology:bone_leggings", + "ancientology:bone_pickaxe", + "ancientology:bone_shovel", + "ancientology:bone_spear" + ] +} diff --git a/src/main/resources/data/forge/tags/items/bronze.json b/src/main/resources/data/forge/tags/items/bronze.json new file mode 100644 index 0000000..8c3dc5c --- /dev/null +++ b/src/main/resources/data/forge/tags/items/bronze.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "ancientology:bronze_arrow", + "ancientology:bronze_axe", + "ancientology:bronze_boots", + "ancientology:bronze_chestplate", + "ancientology:bronze_dagger", + "ancientology:bronze_helmet", + "ancientology:bronze_hoe", + "ancientology:bronze_leggings", + "ancientology:bronze_pickaxe", + "ancientology:bronze_shovel", + "ancientology:bronze_spear" + ] +} diff --git a/src/main/resources/data/forge/tags/items/copper.json b/src/main/resources/data/forge/tags/items/copper.json new file mode 100644 index 0000000..ea9e7eb --- /dev/null +++ b/src/main/resources/data/forge/tags/items/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ancientology:copper_nugget" + ] +} diff --git a/src/main/resources/data/forge/tags/items/damascus.json b/src/main/resources/data/forge/tags/items/damascus.json new file mode 100644 index 0000000..3c40044 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/damascus.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "ancientology:damascus_ingot", + "ancientology:damascus_sword", + "ancientology:damascus_axe", + "ancientology:mjolnir", + "ancientology:schimitar" + ] +} diff --git a/src/main/resources/data/forge/tags/items/flint.json b/src/main/resources/data/forge/tags/items/flint.json new file mode 100644 index 0000000..021d4f2 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/flint.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "ancientology:flint_arrow", + "ancientology:flint", + "ancientology:flint_dagger", + "ancientology:flint_hoe", + "ancientology:flint_pickaxe", + "ancientology:flint_shovel", + "ancientology:flint_spear" + ] +} diff --git a/src/main/resources/data/forge/tags/items/ingots.json b/src/main/resources/data/forge/tags/items/ingots.json index 21fa261..7108190 100644 --- a/src/main/resources/data/forge/tags/items/ingots.json +++ b/src/main/resources/data/forge/tags/items/ingots.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "ancientology:tin_ingot", - "ancientology:bronze_ingot" + "ancientology:bronze_ingot", + "ancientology:steel_ingot", + "ancientology:damascus_ingot" ] } diff --git a/src/main/resources/data/forge/tags/items/nuggets.json b/src/main/resources/data/forge/tags/items/nuggets.json index acec1a6..09d3b87 100644 --- a/src/main/resources/data/forge/tags/items/nuggets.json +++ b/src/main/resources/data/forge/tags/items/nuggets.json @@ -3,6 +3,7 @@ "values": [ "ancientology:tin_nugget", "ancientology:copper_nugget", - "ancientology:bronze_nugget" + "ancientology:bronze_nugget", + "ancientology:steel_nugget" ] } diff --git a/src/main/resources/data/forge/tags/items/raw_materials.json b/src/main/resources/data/forge/tags/items/raw_materials.json index 96a84b1..a4bd87e 100644 --- a/src/main/resources/data/forge/tags/items/raw_materials.json +++ b/src/main/resources/data/forge/tags/items/raw_materials.json @@ -2,5 +2,6 @@ "replace": false, "values": [ "ancientology:raw_tin" + ] } diff --git a/src/main/resources/data/forge/tags/items/steel.json b/src/main/resources/data/forge/tags/items/steel.json new file mode 100644 index 0000000..d098012 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/steel.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "ancientology:steel_blend", + "ancientology:steel_ingot", + "ancientology:steel_nugget", + + + ] +} diff --git a/src/main/resources/data/forge/tags/items/tin.json b/src/main/resources/data/forge/tags/items/tin.json new file mode 100644 index 0000000..e56d844 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/tin.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "ancientology:raw_tin", + "ancientology:tin_ingot", + "ancientology:tin_block", + "ancientology:tin_nugget", + ] +}