From 825b01db30c17531777b098b602148066b68b03f Mon Sep 17 00:00:00 2001 From: John Yorke Date: Mon, 29 Nov 2021 15:53:50 -0400 Subject: [PATCH] Remove lib package --- .../taintedmagic/common/TMCreativeTab.java | 4 +-- .../taintedmagic/common/TaintedMagic.java | 9 ++++-- .../common/handler/UpdateHandler.java | 3 +- .../TMMaterials.java} | 4 +-- .../java/taintedmagic/common/lib/LibInfo.java | 10 ------ .../common/network/PacketHandler.java | 5 +-- .../common/registry/ItemRegistry.java | 32 +++++++++---------- 7 files changed, 30 insertions(+), 37 deletions(-) rename src/main/java/taintedmagic/common/{lib/LibMaterials.java => items/TMMaterials.java} (94%) delete mode 100644 src/main/java/taintedmagic/common/lib/LibInfo.java diff --git a/src/main/java/taintedmagic/common/TMCreativeTab.java b/src/main/java/taintedmagic/common/TMCreativeTab.java index 0773ae9..150efb1 100644 --- a/src/main/java/taintedmagic/common/TMCreativeTab.java +++ b/src/main/java/taintedmagic/common/TMCreativeTab.java @@ -1,6 +1,5 @@ package taintedmagic.common; -import java.util.ArrayList; import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -8,7 +7,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; import taintedmagic.common.helper.TaintedMagicHelper; -import taintedmagic.common.lib.LibInfo; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; @@ -16,7 +14,7 @@ import thaumcraft.common.items.wands.ItemWandCasting; public class TMCreativeTab extends CreativeTabs { public TMCreativeTab () { - super(LibInfo.MODID); + super(TaintedMagic.MOD_ID); } @Override diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index dae094b..85e5f23 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -13,11 +13,16 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; -import taintedmagic.common.lib.LibInfo; -@Mod (modid = LibInfo.MODID, name = LibInfo.NAME, version = LibInfo.VERSION, dependencies = LibInfo.DEPENDENCIES) +@Mod (modid = TaintedMagic.MOD_ID, name = TaintedMagic.MOD_NAME, version = TaintedMagic.VERSION, + dependencies = TaintedMagic.DEPENDENCIES) public class TaintedMagic { + public static final String MOD_ID = "TaintedMagic"; + public static final String MOD_NAME = "Tainted Magic"; + public static final String VERSION = "@VERSION@"; + public static final String DEPENDENCIES = "required-after:Forge@[10.13.4.1448,);required-after:Thaumcraft@[4.2.3.5,)"; + @Mod.Instance ("TaintedMagic") public static TaintedMagic instance; diff --git a/src/main/java/taintedmagic/common/handler/UpdateHandler.java b/src/main/java/taintedmagic/common/handler/UpdateHandler.java index a9f41ad..666cb48 100644 --- a/src/main/java/taintedmagic/common/handler/UpdateHandler.java +++ b/src/main/java/taintedmagic/common/handler/UpdateHandler.java @@ -7,10 +7,9 @@ import java.util.Scanner; import net.minecraft.util.EnumChatFormatting; import taintedmagic.common.TaintedMagic; -import taintedmagic.common.lib.LibInfo; public class UpdateHandler { - private static String currentVersion = LibInfo.VERSION; + private static String currentVersion = TaintedMagic.VERSION; private static String newestVersion; public static String updateStatus = null; diff --git a/src/main/java/taintedmagic/common/lib/LibMaterials.java b/src/main/java/taintedmagic/common/items/TMMaterials.java similarity index 94% rename from src/main/java/taintedmagic/common/lib/LibMaterials.java rename to src/main/java/taintedmagic/common/items/TMMaterials.java index f77cf43..48f5bc0 100644 --- a/src/main/java/taintedmagic/common/lib/LibMaterials.java +++ b/src/main/java/taintedmagic/common/items/TMMaterials.java @@ -1,10 +1,10 @@ -package taintedmagic.common.lib; +package taintedmagic.common.items; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; -public class LibMaterials { +public class TMMaterials { // Tool materials public static ToolMaterial toolMatHollow = EnumHelper.addToolMaterial("HOLLOW", 1, 200, 4.0F, -0.5F, 5); public static ToolMaterial toolMatShadow = EnumHelper.addToolMaterial("SHADOW", 3, 2500, 17.0F, 6.0F, 30); diff --git a/src/main/java/taintedmagic/common/lib/LibInfo.java b/src/main/java/taintedmagic/common/lib/LibInfo.java deleted file mode 100644 index ab195b5..0000000 --- a/src/main/java/taintedmagic/common/lib/LibInfo.java +++ /dev/null @@ -1,10 +0,0 @@ -package taintedmagic.common.lib; - -public class LibInfo { - - public static final String MODID = "TaintedMagic"; - public static final String NAME = "Tainted Magic"; - public static final String VERSION = "r8.1"; - public static final String DEPENDENCIES = - "required-after:Forge@[10.13.4.1448,);required-after:Thaumcraft@[4.2.3.5,);after:ThaumicTinkerer"; -} diff --git a/src/main/java/taintedmagic/common/network/PacketHandler.java b/src/main/java/taintedmagic/common/network/PacketHandler.java index 537fce5..632bda9 100644 --- a/src/main/java/taintedmagic/common/network/PacketHandler.java +++ b/src/main/java/taintedmagic/common/network/PacketHandler.java @@ -3,11 +3,12 @@ package taintedmagic.common.network; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import taintedmagic.common.lib.LibInfo; +import taintedmagic.common.TaintedMagic; public class PacketHandler { - public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(LibInfo.MODID.toLowerCase()); + public static final SimpleNetworkWrapper INSTANCE = + NetworkRegistry.INSTANCE.newSimpleChannel(TaintedMagic.MOD_ID.toLowerCase()); public static void initPackets () { INSTANCE.registerMessage(PacketKatanaAttack.class, PacketKatanaAttack.class, 0, Side.SERVER); diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java index 133caf8..f3c3872 100644 --- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java @@ -19,6 +19,7 @@ import taintedmagic.common.items.ItemNightshadeBerries; import taintedmagic.common.items.ItemSalis; import taintedmagic.common.items.ItemVoidBlood; import taintedmagic.common.items.ItemWarpFertilizer; +import taintedmagic.common.items.TMMaterials; import taintedmagic.common.items.equipment.ItemLumosRing; import taintedmagic.common.items.equipment.ItemShadowFortressArmor; import taintedmagic.common.items.equipment.ItemVoidFortressArmor; @@ -43,7 +44,6 @@ import taintedmagic.common.items.wand.foci.ItemFocusMageMace; import taintedmagic.common.items.wand.foci.ItemFocusShockwave; import taintedmagic.common.items.wand.foci.ItemFocusTaintSwarm; import taintedmagic.common.items.wand.foci.ItemFocusVisShard; -import taintedmagic.common.lib.LibMaterials; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.wands.StaffRod; import thaumcraft.api.wands.WandCap; @@ -142,37 +142,37 @@ public class ItemRegistry { GameRegistry.registerItem(ItemWarpFertilizer, "ItemWarpFertilizer"); // Armor and Baubles - ItemWarpedGoggles = new ItemWarpedGoggles(LibMaterials.armorMatWarped, 4, 0); + ItemWarpedGoggles = new ItemWarpedGoggles(TMMaterials.armorMatWarped, 4, 0); GameRegistry.registerItem(ItemWarpedGoggles, "ItemWarpedGoggles"); ItemVoidFortressHelmet = - new ItemVoidFortressArmor(LibMaterials.armorMatVoidFortress, 4, 0).setUnlocalizedName("ItemVoidFortressHelmet"); + new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 0).setUnlocalizedName("ItemVoidFortressHelmet"); GameRegistry.registerItem(ItemVoidFortressHelmet, "ItemVoidFortressHelmet"); - ItemVoidFortressChestplate = new ItemVoidFortressArmor(LibMaterials.armorMatVoidFortress, 4, 1) + ItemVoidFortressChestplate = new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 1) .setUnlocalizedName("ItemVoidFortressChestplate"); GameRegistry.registerItem(ItemVoidFortressChestplate, "ItemVoidFortressChestplate"); - ItemVoidFortressLeggings = new ItemVoidFortressArmor(LibMaterials.armorMatVoidFortress, 4, 2) + ItemVoidFortressLeggings = new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 2) .setUnlocalizedName("ItemVoidFortressLeggings"); GameRegistry.registerItem(ItemVoidFortressLeggings, "ItemVoidFortressLeggings"); ItemVoidwalkerBoots = - new ItemVoidwalkerBoots(LibMaterials.armorMatVoidwalker, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots"); + new ItemVoidwalkerBoots(TMMaterials.armorMatVoidwalker, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots"); GameRegistry.registerItem(ItemVoidwalkerBoots, "ItemVoidwalkerBoots"); ItemVoidwalkerSash = new ItemVoidwalkerSash(); GameRegistry.registerItem(ItemVoidwalkerSash, "ItemVoidwalkerSash"); - ItemShadowFortressHelmet = new ItemShadowFortressArmor(LibMaterials.armorMatShadowFortress, 4, 0) + ItemShadowFortressHelmet = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 0) .setUnlocalizedName("ItemShadowFortressHelmet"); GameRegistry.registerItem(ItemShadowFortressHelmet, "ItemShadowFortressHelmet"); - ItemShadowFortressChestplate = new ItemShadowFortressArmor(LibMaterials.armorMatShadowFortress, 4, 1) + ItemShadowFortressChestplate = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 1) .setUnlocalizedName("ItemShadowFortressChestplate"); GameRegistry.registerItem(ItemShadowFortressChestplate, "ItemShadowFortressChestplate"); - ItemShadowFortressLeggings = new ItemShadowFortressArmor(LibMaterials.armorMatShadowFortress, 4, 2) + ItemShadowFortressLeggings = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 2) .setUnlocalizedName("ItemShadowFortressLeggings"); GameRegistry.registerItem(ItemShadowFortressLeggings, "ItemShadowFortressLeggings"); @@ -233,25 +233,25 @@ public class ItemRegistry { ItemThaumicDisassembler = new ItemThaumicDisassembler(); GameRegistry.registerItem(ItemThaumicDisassembler, "ItemThaumicDisassembler"); - ItemHollowDagger = new ItemHollowDagger(LibMaterials.toolMatHollow); + ItemHollowDagger = new ItemHollowDagger(TMMaterials.toolMatHollow); GameRegistry.registerItem(ItemHollowDagger, "ItemHollowDagger"); - ItemShadowmetalHoe = new ItemShadowmetalHoe(LibMaterials.toolMatShadow); + ItemShadowmetalHoe = new ItemShadowmetalHoe(TMMaterials.toolMatShadow); GameRegistry.registerItem(ItemShadowmetalHoe, "ItemShadowmetalHoe"); - ItemShadowmetalPick = new ItemShadowmetalPick(LibMaterials.toolMatShadow); + ItemShadowmetalPick = new ItemShadowmetalPick(TMMaterials.toolMatShadow); GameRegistry.registerItem(ItemShadowmetalPick, "ItemShadowmetalPick"); - ItemShadowmetalAxe = new ItemShadowmetalAxe(LibMaterials.toolMatShadow); + ItemShadowmetalAxe = new ItemShadowmetalAxe(TMMaterials.toolMatShadow); GameRegistry.registerItem(ItemShadowmetalAxe, "ItemShadowmetalAxe"); - ItemShadowmetalSpade = new ItemShadowmetalSpade(LibMaterials.toolMatShadow); + ItemShadowmetalSpade = new ItemShadowmetalSpade(TMMaterials.toolMatShadow); GameRegistry.registerItem(ItemShadowmetalSpade, "ItemShadowmetalSpade"); - ItemShadowmetalSword = new ItemShadowmetalSword(LibMaterials.toolMatShadow); + ItemShadowmetalSword = new ItemShadowmetalSword(TMMaterials.toolMatShadow); GameRegistry.registerItem(ItemShadowmetalSword, "ItemShadowmetalSword"); - ItemPrimalBlade = new ItemPrimalBlade(LibMaterials.toolMatPrimal); + ItemPrimalBlade = new ItemPrimalBlade(TMMaterials.toolMatPrimal); GameRegistry.registerItem(ItemPrimalBlade, "ItemPrimalBlade"); ItemKatana = new ItemKatana();