From 5708fad8104a5f6d9e886bdb1fe0da2fd14454e0 Mon Sep 17 00:00:00 2001 From: TeenagedLime3 Date: Sun, 13 Feb 2022 22:41:25 +0000 Subject: [PATCH 1/3] damascus added damascus ingots and weapons. Added more tags for jei. Fixed the ordering of the items in the iteminit to be organised. --- CREDITS.md | 6 +- README.md | 2 + .../common/items/MjolnirItem.java | 27 ++++++ .../common/items/SchimitarItem.java | 27 ++++++ .../ancientology/core/init/ItemInit.java | 35 +++++--- .../core/materials/ToolMaterials.java | 3 +- .../util/datastructures/SimpleContainer.java | 15 ++-- .../assets/ancientology/lang/en_us.json | 77 ++++++++++++------ .../models/item/damascus_axe.json | 6 ++ .../models/item/damascus_ingot.json | 6 ++ .../models/item/damascus_sword.json | 6 ++ .../ancientology/models/item/mjolnir.json | 6 ++ .../ancientology/models/item/scimitar.json | 6 ++ .../ancientology/models/item/steel_blend.json | 6 ++ .../ancientology/models/item/steel_ingot.json | 6 ++ .../models/item/steel_nugget.json | 6 ++ .../textures/block/steel_block.png | Bin 0 -> 802 bytes .../textures/item/damascus_axe.png | Bin 0 -> 548 bytes .../textures/item/damascus_ingot.png | Bin 0 -> 662 bytes .../textures/item/damascus_sword.png | Bin 0 -> 550 bytes .../assets/ancientology/textures/item/img.png | Bin 0 -> 380 bytes .../ancientology/textures/item/img_1.png | Bin 0 -> 380 bytes .../ancientology/textures/item/mjolnir.png | Bin 0 -> 483 bytes .../ancientology/textures/item/scimitar.png | Bin 0 -> 549 bytes .../textures/item/steel_blend.png | Bin 0 -> 766 bytes .../textures/item/steel_block.png | Bin 0 -> 802 bytes .../textures/item/steel_ingot.png | Bin 0 -> 566 bytes .../textures/item/steel_nugget.png | Bin 0 -> 441 bytes .../resources/data/forge/tags/items/bone.json | 16 ++++ .../data/forge/tags/items/bronze.json | 16 ++++ .../data/forge/tags/items/copper.json | 6 ++ .../data/forge/tags/items/damascus.json | 10 +++ .../data/forge/tags/items/flint.json | 12 +++ .../data/forge/tags/items/ingots.json | 4 +- .../data/forge/tags/items/nuggets.json | 3 +- .../data/forge/tags/items/raw_materials.json | 1 + .../data/forge/tags/items/steel.json | 10 +++ .../resources/data/forge/tags/items/tin.json | 9 ++ 38 files changed, 277 insertions(+), 50 deletions(-) create mode 100644 src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java create mode 100644 src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java create mode 100644 src/main/resources/assets/ancientology/models/item/damascus_axe.json create mode 100644 src/main/resources/assets/ancientology/models/item/damascus_ingot.json create mode 100644 src/main/resources/assets/ancientology/models/item/damascus_sword.json create mode 100644 src/main/resources/assets/ancientology/models/item/mjolnir.json create mode 100644 src/main/resources/assets/ancientology/models/item/scimitar.json create mode 100644 src/main/resources/assets/ancientology/models/item/steel_blend.json create mode 100644 src/main/resources/assets/ancientology/models/item/steel_ingot.json create mode 100644 src/main/resources/assets/ancientology/models/item/steel_nugget.json create mode 100644 src/main/resources/assets/ancientology/textures/block/steel_block.png create mode 100644 src/main/resources/assets/ancientology/textures/item/damascus_axe.png create mode 100644 src/main/resources/assets/ancientology/textures/item/damascus_ingot.png create mode 100644 src/main/resources/assets/ancientology/textures/item/damascus_sword.png create mode 100644 src/main/resources/assets/ancientology/textures/item/img.png create mode 100644 src/main/resources/assets/ancientology/textures/item/img_1.png create mode 100644 src/main/resources/assets/ancientology/textures/item/mjolnir.png create mode 100644 src/main/resources/assets/ancientology/textures/item/scimitar.png create mode 100644 src/main/resources/assets/ancientology/textures/item/steel_blend.png create mode 100644 src/main/resources/assets/ancientology/textures/item/steel_block.png create mode 100644 src/main/resources/assets/ancientology/textures/item/steel_ingot.png create mode 100644 src/main/resources/assets/ancientology/textures/item/steel_nugget.png create mode 100644 src/main/resources/data/forge/tags/items/bone.json create mode 100644 src/main/resources/data/forge/tags/items/bronze.json create mode 100644 src/main/resources/data/forge/tags/items/copper.json create mode 100644 src/main/resources/data/forge/tags/items/damascus.json create mode 100644 src/main/resources/data/forge/tags/items/flint.json create mode 100644 src/main/resources/data/forge/tags/items/steel.json create mode 100644 src/main/resources/data/forge/tags/items/tin.json 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..2f03b95 --- /dev/null +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java @@ -0,0 +1,27 @@ +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..b9ac6d6 --- /dev/null +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java @@ -0,0 +1,27 @@ +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 0000000000000000000000000000000000000000..fbacbf1fd3e48b0ab65f26897a12715771d7f119 GIT binary patch literal 802 zcmV+-1Ks?IP)Px%+(|@1R5(vnlgo44L>$LI>xX1Zj3p~1Or6Fm99`0;hYol9Qp}~$TXM~R%0Ri$ zViVE_3Di#Qw8@B7SWa~#J(2*G4BAq+#L zl%NzcOA&*9U+vz%$M2&t(JH2Qw?~{v!^CwQ&gU~TU@|=;>~@)+O^KE(?tJwn@88c6 zgF#<)cS8O+I%ZvD>^<0{+YLEAIl;0l4P=-s79Ws_h(H#o@3Q(M3F=Z*xKA=Y~+L_Qlj)U1OmmaPKRHA8zCM){z3U|kM%mkaa@u(Hs7Mi zQ9__ylW{_pCfJQ8+nrl1mJ58Z&C{p9AifLpmfs>?B?zI&^OCpo8AX=U`?_a3A`TA^RaurC zA04wwB6fRsNwbU~Xyf~B?E+C0bA5Gf-p9{B{zRNcJbd^KqtWwE40P7EP6EMfHluU9 zWBR74PA5}#@7@33o6v)_H_x6w(;n=r)yEi_#iT_}rM$tm8&oP7CYfB57bR7@Mv<+J g6uq*%p!zS!KdRA#@sW!*#sB~S07*qoM6N<$f_lDwU;qFB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2684678cd46a5f38cde521361ca42fdd3ba8c662 GIT binary patch literal 548 zcmV+<0^9wGP)Px$-bqA3R5(vvQ$0@`K@^-Vfhu4mr?RXxlr%9ViFQx2e*_W~v`Dm&RAADQDoPbw z`3Gr&bZaH|3m}!90EhVK0wuIBdLMV}rMcVP+xKSP%$#%10R+I2y!heZWY25)q{p`6 zJzvsOdo^y=8*b!-ms>H9g2aGCf&viVu=du^uy_ZA;OS^M6f%47-yx5Ys|A&~kk?8$ zA!-wakkQfMA^u!kpe#$g>UQyEG)9cMbguxVK{c_X0r{Y2I+~8m+w3+7C<`&{4hxZwVd)t`aJT>Y>43l5TWj+ue#XNUBaKE=i z8#~7=Bzy=MkH*L+rboq~_A2Sk-v+%Fb=vbNPVce*;WMtvD-=b67$@SOlN^}gqNzE~ z#r?Gwy$L`%=ehyKDx$`DQK#e{l%ieN@qd( mO|Mn$|Jjt<0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2413ecaeea5048e5369e5b0ac6b13bcca7ce920c GIT binary patch literal 662 zcmV;H0%`q;P)Px%P)S5VR5(v%lhIBZK@^6+5mGSSB~5BAv}zMktTy4MyXl?K8|qWoM{C+Aus#6T zMB9sEo6tf{ToW28MH)~RL@D4jGrJ(xxtX(P=l{=tX8t44OCXR)@8iF9{crM=@L&iP zNEP|;aijxv!l%{SO|lX4wgye_5eOlX5^T#-8~J=*v0fLvr9gmGm5~~xG)gI%o13TA zI-}8SP$(1>udiq%Ol73N(jXOsVH(^sBb>P|7u^dIi3Ep74#R$*{C-|2Nm`C&TUw{; za528f@^XSB$DwiB#C2PQLt#>>b-sTq@~c`U5;18uPub6Z7D9nTcS6k1FKD_KwypZ4 zecr)swV9c@&%%=hoI{6lxy*1lAQ%klHV16pypJyT|IYRi;B>(&?A%e8}Op zT&+Uiy_7_wG1_gHh-o5)pmJP6Shg*nuB_m?F2Ac)VviqDF8{>5YtZSmc^Hk+>s=5E zO_NL}$!4>Nz!auoP_LaJ)TO1?Q|y2J!t8@tK7HI{F&@`_D{Ec$F13PJ8yoE8a=v?@ zR;$tP4G^|vOT#e8WHM}TZ&Rrpv%0pX??biF?RJSpqomSlwzl5WId8)dL_kn17PS%e zD{OAQ=G~jO)c%~H?xf>(2!?}NNxfdz&nn~7EvfoCbR3rBOVsNp zz!XwkQ7ZoMy*X(+FC{z;o^6xKr0fm;5@3pAsiZvUO^7-T%v!g(xA@bQZ w*0-JXXh+lF4Tf*sQ9CL%E;tf@12|6d5Ab;t93Lud*8l(j07*qoM6N<$f0@?kEP)Px$;7LS5R5(vTb5-zXy(0VJEB=c&-3%m%=gU@fdDW7(tmlYg?bNIY~p7S0n7v< z8!a!f$P2_a$RSu@0b;ePIgVo=0AtLsjG}=B*+<(V9bWP-<}_VkG{tSXqgPu4oM9O9a<#;|DDd*+6=v^esLBdvXUHb~|LaL~zDPipOB6+c@zJqk+wDTPwf0+= ztj8przdqz(bb#-_4zOCSP!wO#G&eTJNBSibgRZzknw=i9W&i*H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..091d0c0401a9924e43e6966ead305d38e0661fc6 GIT binary patch literal 380 zcmV-?0fYXDP)Z~MK=;H|gYZQaz)xhRS#C2@>*Oh_<6*0Lyk z&o|a&&Rs9pEOS~Z~C?rWf`syuyH@L9UhV+D;0If%~Zt0%0)Mw(Wer zAQa&VrS#Df`?}rOlzG07X0Q-Tfo6LSsl(u>(1$Riweoxqze`C-!P0OHjf7T$0UaOw awY~ukoMak;B=unc0000Z~MK=;H|gYZQaz)xhRS#C2@>*Oh_<6*0Lyk z&o|a&&Rs9pEOS~Z~C?rWf`syuyH@L9UhV+D;0If%~Zt0%0)Mw(Wer zAQa&VrS#Df`?}rOlzG07X0Q-Tfo6LSsl(u>(1$Riweoxqze`C-!P0OHjf7T$0UaOw awY~ukoMak;B=unc0000Px$ok>JNR5(vvQ%y_5KoEVa)FQ=#R1u+mP*HkO6VUdm*h2l6p8O3$;=!vYZ}nm& zv^^=57A(}FEAz3*uFH~y+1dBr%)A)TG61aMw}FLj3Gs zKRD(V6AFSZh0|CVrfiLPD59H}Mm1sstpSV5k~_v214^darCtZG-^PFweBFiQoL(BJ zP4Y??Hm`er6-2@MgKop3)9J97$28S^QUMqRlIDuC96&2Vw|iq7jUz0+7Z{JmEH+IN zN{0=~@oD9lH?i0E>L{(2I5wG0F`Z11CQgl~S;pu|QR77MnZ3MdVK$wiTHU~Vma&R( z*xDZ77Y_S0j&1Y!gfA2Ra`}VtXoMt9azdBu{F{%e*WR|*(I)Pn*Rk@uf+#-6TDgq3 z!2l@%h^y7o>_ayugI=p<4|gkgdig*ypXd+2q*>0{Vu61K4WZH8udpy;=B|;cZD{WNisx`b Z{sYmhxEj8_xOM;l002ovPDHLkV1o5m;E@0T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e4d0d5ff7be6ecc7edb1f4197c0c67f9b0d50856 GIT binary patch literal 549 zcmV+=0^0qFP)Px$-$_J4R5(vgiS3dC(SqW&;ay_ivn25Y@CaOmlHEx6 z2z35Qg|4Oqs>{I6j2#z5DaLEh%=fnh00e-E0A{V@p`F`Hu${U*=MVz1eMqsL?B&$1 z6Qx&waU>zn*L*m7l%<0YLE4CHvuw3SDTyN>JtW2C);Tv#gUx2611K(;W1gVvp&*iy z5uqQBM-0P&O;sUyF94N-(4R4n8|`tN?_AFNra`hyP!vW%28=|7vyhUFDw4v_*N(kE zVCc_SB`Y{rAe_8@KK|7K<7?a_370#8eja+Pk_4`B2tG{uUWJ|%*CKaLR6Kf*XGHXL zVJ^yI;yxl59oaZ%St_6wi-k0v`yNS}(dF{QWm&+-%`?$sX(Fm+X`1p~U1Pi7;r{DA zR?8)dq7*$(Cr|O4QF_tbOuD8HK$4|gS9jR$wzz$Li{MWb)sm!IpwuCaorxH2BYb{; z!*5D}{?}HGn1)Q?7>zMGqJCW1 nw(TUPx%xJg7oR5(vnQ_oKmQ4szfw52~t+CmE#3~kWXLJSn_wzgpLAUERG#F)sRpk9c7 zfO^z;P!Hd`M#NN2=qe$ zLIDbZ5N`QHJ%qogM)$LyD2VPPl<;6s&GL959H#a4^%x%?BhQ{Zr4JuJLS{OnhC>V2 zuRtsoqx%O3aM~S6Bt}SIZ=80Y4YIUji6nNFT^v@c$S>!~kwPj6ijW}CSS-q_&d$!E zmH@$?9*89osZ@&LaywnPeDw-$-nh=m=&V#c0~ZHqdwT~8g;n-VkrnJ!_7FJJjzVD# zf)K)kd-t)tvcllAc%pSc2n#fJF2D#1WhfOH&c;Sao13sVxX{?(#PgRgP*-a}cXt=o*Ne!^@Nu%!e?Cq< zZC;p-X8hV%g{{uY2rm81qqwoAju?rN5wx_Nz~H4pB;JlPx%+(|@1R5(vnlgo44L>$LI>xX1Zj3p~1Or6Fm99`0;hYol9Qp}~$TXM~R%0Ri$ zViVE_3Di#Qw8@B7SWa~#J(2*G4BAq+#L zl%NzcOA&*9U+vz%$M2&t(JH2Qw?~{v!^CwQ&gU~TU@|=;>~@)+O^KE(?tJwn@88c6 zgF#<)cS8O+I%ZvD>^<0{+YLEAIl;0l4P=-s79Ws_h(H#o@3Q(M3F=Z*xKA=Y~+L_Qlj)U1OmmaPKRHA8zCM){z3U|kM%mkaa@u(Hs7Mi zQ9__ylW{_pCfJQ8+nrl1mJ58Z&C{p9AifLpmfs>?B?zI&^OCpo8AX=U`?_a3A`TA^RaurC zA04wwB6fRsNwbU~Xyf~B?E+C0bA5Gf-p9{B{zRNcJbd^KqtWwE40P7EP6EMfHluU9 zWBR74PA5}#@7@33o6v)_H_x6w(;n=r)yEi_#iT_}rM$tm8&oP7CYfB57bR7@Mv<+J g6uq*%p!zS!KdRA#@sW!*#sB~S07*qoM6N<$f_lDwU;qFB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eeead0ee08c73f8edb3fda080469a9e5ddbb598e GIT binary patch literal 566 zcmV-60?GY}P)Px$@JU2LR5(v%Q!#VePz?S=$HcQudToc0=1P{(p&8oF4Zpsz(=dq0&0ZC&0H-? zLuLXIBfni@GPy)I=@Laz%$~Q4&tJYmY6Pv2WeXT%DXv9NhpD}3sldO-dyu5u{&tG* z=jUiPn+ljJ5)Bxpsov$a(b!+>FX7_n1xV6wpSF?Z3ygk^@ZsnPKhmLT%!K`e#(#Y+ ziU-wXcJ#s~r*R~G z)JaBLjNDL4D?<)~I*Nw^-p&qY*H3{u)zuAkcFUzSLpY9)tGNA zoDpp7ipxf8-J0`_#j2J>hrQa&>RM*F#k94u)(PwGGdIKWcArjEasU7T07*qoM6N<$ Ef?S;b^8f$< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ff543906e37e1b8c710beb5abb9023721cd82704 GIT binary patch literal 441 zcmV;q0Y?6bP)Px$b4f%&R5(v%Q%hC?K@69pp-OpQFbk$u%6eB1;$t$7M9Xp$Az& zlTKGEl?tK$5CO~p0buz8Kn$=SL16tuAYw};&9+1dNW>o4E58klDdw081!4xvLrIGp zxzc*%EbLdaf}|C=BnYhlP#njMvUXhu9pDnOrX($=Y#jk8rL|6!f$QYjxdhfmbe?nK zhxptp>-E|sW?*@{!tQm4wk@IQynYNxSrQ|q z%$vbL@&a(-%X1LSPBjj;@#O>MS_ZGTD|@+cWKx?|^{LO%p!8wq|WC jbDL2zc2Z~B_P?6HE~~N~;AOOk00000NkvXXu0mjf?>E3& literal 0 HcmV?d00001 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", + ] +} From 8e5c8b1cab458649b44d960c3ab5ad64015e1aea Mon Sep 17 00:00:00 2001 From: TeenagedLime3 <88453457+TeenagedLime3@users.noreply.github.com> Date: Mon, 14 Feb 2022 13:35:22 +0000 Subject: [PATCH 2/3] Update src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java Co-authored-by: xf8b --- .../ancientology/common/items/MjolnirItem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 index 2f03b95..4a63d86 100644 --- a/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/MjolnirItem.java @@ -15,12 +15,13 @@ 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()){ + List pTooltipComponents, TooltipFlag pIsAdvanced) { + if (Screen.hasShiftDown()) { pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.mjolnir")); - } else{ + } else { pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.mjolnir.shift")); } } From 7d27786fd747daa18bd0342743d07bf953cab4aa Mon Sep 17 00:00:00 2001 From: TeenagedLime3 <88453457+TeenagedLime3@users.noreply.github.com> Date: Mon, 14 Feb 2022 13:35:33 +0000 Subject: [PATCH 3/3] Update src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java Co-authored-by: xf8b --- .../ancientology/common/items/SchimitarItem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 index b9ac6d6..a7b21f2 100644 --- a/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java +++ b/src/main/java/io/github/darealturtywurty/ancientology/common/items/SchimitarItem.java @@ -15,12 +15,13 @@ 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()){ + List pTooltipComponents, TooltipFlag pIsAdvanced) { + if (Screen.hasShiftDown()) { pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.schimitar")); - } else{ + } else { pTooltipComponents.add(new TranslatableComponent("tooltip.ancientology.schimitar.shift")); } }