Rename (almost) all Inverted Tools

src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java

@@ -6,8 +6,8 @@
 
 import com.fouristhenumber.utilitiesinexcess.client.IMCForNEI;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockColored;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemDestructionPickaxe;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemReversingHoe;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemErasurePickaxe;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemRetrogradeHoe;
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.FMPCompat;
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.FMPItems;
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.multipart.Content;
@@ -35,8 +35,8 @@ public class CommonProxy {
     public ArrayProximityCheck4D mobSpawnBlockChecks = new ArrayProximityCheck4D(VolumeShape.CUBE);
 
     public SyncedKeybind GLOVE_KEYBIND;
-    public SyncedKeybind ARCHITECTS_KEYBIND_H;
-    public SyncedKeybind ARCHITECTS_KEYBIND_V;
+    public SyncedKeybind BUILDERS_KEYBIND_H;
+    public SyncedKeybind BUILDERS_KEYBIND_V;
 
     public void preInit(FMLPreInitializationEvent event) {
         // Config is handled in the early mixin loader (UIEMixinLoader)
@@ -72,9 +72,8 @@ public void preInit(FMLPreInitializationEvent event) {
     public void init(FMLInitializationEvent event) {
         soundVolumeChecks = new SoundVolumeChecks();
         GLOVE_KEYBIND = SyncedKeybind.createConfigurable("uie.key.glove", "uie.key.categories.uie", Keyboard.KEY_NONE);
-        ARCHITECTS_KEYBIND_H = SyncedKeybind
-            .createFromMC(() -> () -> Minecraft.getMinecraft().gameSettings.keyBindSneak);
-        ARCHITECTS_KEYBIND_V = SyncedKeybind
+        BUILDERS_KEYBIND_H = SyncedKeybind.createFromMC(() -> () -> Minecraft.getMinecraft().gameSettings.keyBindSneak);
+        BUILDERS_KEYBIND_V = SyncedKeybind
             .createFromMC(() -> () -> Minecraft.getMinecraft().gameSettings.keyBindSprint);
         ModTileEntities.init();
     }
@@ -84,8 +83,8 @@ public void postInit(FMLPostInitializationEvent event) {
             PosteaTransforms.postInit();
         }
 
-        ItemReversingHoe.initializeCache();
-        ItemDestructionPickaxe.initializeCache();
+        ItemRetrogradeHoe.initializeCache();
+        ItemErasurePickaxe.initializeCache();
         if (Mods.Tinkers.isLoaded() && OtherConfig.enableTinkersIntegration) {
             TinkersCompat.init();
         }

src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java

@@ -5,8 +5,8 @@
 import net.minecraft.item.ItemStack;
 
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemAnalyzer;
-import com.fouristhenumber.utilitiesinexcess.common.items.ItemArchitectsWand;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemBedrockiumIngot;
+import com.fouristhenumber.utilitiesinexcess.common.items.ItemBuildersWand;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemCapacityUpgrade;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemChunchunmaru;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemEnderLotusSeed;
@@ -23,26 +23,26 @@
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemWateringCan;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemXRayGlasses;
 import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemAntiGravityShovel;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemDestructionPickaxe;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemEthericSword;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemGourmandsAxe;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemPrecisionShears;
-import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemReversingHoe;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemErasurePickaxe;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemLiminalSword;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemRecallShears;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemRetrogradeHoe;
+import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemSatingAxe;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.BlockConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.ColoredBlocksConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.EnderLotusConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.ArchitectsWandsConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.BuildersWandsConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.ChunchunmaruConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.FireBatteryConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.InversionConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.ItemConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.WateringCanConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.AntiGravityShovelConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.DestructionPickaxeConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.EthericSwordConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.GourmandsAxeConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.PrecisionShearsConfig;
-import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.ReversingHoeConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.ErasurePickaxeConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.LiminalSwordConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.RecallShearsConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.RetrogradeHoeConfig;
+import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.SatingAxeConfig;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -51,12 +51,12 @@ public enum ModItems {
     // spotless:off
 
     // make sure to leave a trailing comma
-    GOURMANDS_AXE(GourmandsAxeConfig.INSTANCE.enable, new ItemGourmandsAxe(), "gourmands_axe"),
-    DESTRUCTION_PICKAXE(DestructionPickaxeConfig.INSTANCE.enable, new ItemDestructionPickaxe(), "destruction_pickaxe"),
+    SATING_AXE(SatingAxeConfig.INSTANCE.enable, new ItemSatingAxe(), "sating_axe"),
+    ERASURE_PICKAXE(ErasurePickaxeConfig.INSTANCE.enable, new ItemErasurePickaxe(), "erasure_pickaxe"),
     ANTI_GRAVITY_SHOVEL(AntiGravityShovelConfig.INSTANCE.enable, new ItemAntiGravityShovel(), "anti_gravity_shovel"),
-    PRECISION_SHEARS(PrecisionShearsConfig.INSTANCE.enable, new ItemPrecisionShears(), "precision_shears"),
-    ETHERIC_SWORD(EthericSwordConfig.INSTANCE.enable, new ItemEthericSword(), "etheric_sword"),
-    REVERSING_HOE(ReversingHoeConfig.INSTANCE.enable, new ItemReversingHoe(), "reversing_hoe"),
+    RECALL_SHEARS(RecallShearsConfig.INSTANCE.enable, new ItemRecallShears(), "recall_shears"),
+    LIMINAL_SWORD(LiminalSwordConfig.INSTANCE.enable, new ItemLiminalSword(), "liminal_sword"),
+    RETROGRADE_HOE(RetrogradeHoeConfig.INSTANCE.enable, new ItemRetrogradeHoe(), "retrograde_hoe"),
     HEAVENLY_RING_FEATHER(ItemConfig.heavenlyRing.enable, new ItemHeavenlyRing("feather", 8), "heavenly_ring_feather"),
     HEAVENLY_RING_DRAGON(ItemConfig.heavenlyRing.enable, new ItemHeavenlyRing("dragon", 8), "heavenly_ring_dragon"),
     HEAVENLY_RING_FAIRY(ItemConfig.heavenlyRing.enable, new ItemHeavenlyRing("fairy", 8), "heavenly_ring_fairy"),
@@ -71,8 +71,8 @@ public enum ModItems {
     PSEUDO_REVERSION_SIGIL(InversionConfig.INSTANCE.enableReversionSigil, new ItemPseudoReversionSigil(), "pseudo_reversion_sigil"),
     INVERTED_INGOT(InversionConfig.INSTANCE.enableInvertedIngot, new ItemInvertedIngot(), "inverted_ingot"),
     INVERTED_NUGGET(InversionConfig.INSTANCE.enableInvertedIngot, new ItemInvertedIngot.InvertedNugget(), "inverted_nugget"),
-    ARCHITECTS_WAND(ArchitectsWandsConfig.INSTANCE.enableArchitectsWand, new ItemArchitectsWand(ArchitectsWandsConfig.INSTANCE.architectsWandBuildLimit).setTextureName("utilitiesinexcess:architects_wand"), "architects_wand"),
-    SUPER_ARCHITECTS_WAND(ArchitectsWandsConfig.INSTANCE.enableSuperArchitectsWand, new ItemArchitectsWand(ArchitectsWandsConfig.INSTANCE.superArchitectsWandBuildLimit).setTextureName("utilitiesinexcess:super_architects_wand"), "super_architects_wand"),
+    BUILDERS_WAND(BuildersWandsConfig.INSTANCE.enableBuildersWand, new ItemBuildersWand(BuildersWandsConfig.INSTANCE.buildersWandBuildLimit).setTextureName("utilitiesinexcess:builders_wand"), "builders_wand"),
+    SUPER_BUILDERS_WAND(BuildersWandsConfig.INSTANCE.enableSuperBuildersWand, new ItemBuildersWand(BuildersWandsConfig.INSTANCE.superBuildersWandBuildLimit).setTextureName("utilitiesinexcess:super_builders_wand"), "super_builders_wand"),
     BEDROCKIUM_INGOT(ItemConfig.enableBedrockium, new ItemBedrockiumIngot().setUnlocalizedName("bedrockium_ingot").setTextureName("utilitiesinexcess:bedrockium_ingot"), "bedrockium_ingot"),
     FIRE_BATTERY(FireBatteryConfig.INSTANCE.enableFireBattery, new ItemFireBattery(), "fire_battery"),
     GOLDEN_BAG(ItemConfig.enableGoldenBagOfHolding, new ItemGoldenBag(), "golden_bag"),

src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java

@@ -15,7 +15,7 @@ public static void init() {
             .registerOre("ingotInverted", ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE));
         OreDictionary.registerOre("nuggetUnstable", ModItems.INVERTED_NUGGET.get());
         OreDictionary.registerOre("nuggetInverted", ModItems.INVERTED_NUGGET.get());
-        OreDictionary.registerOre("craftingToolShears", ModItems.PRECISION_SHEARS.get());
+        OreDictionary.registerOre("craftingToolShears", ModItems.RECALL_SHEARS.get());
 
         // Blocks
         OreDictionary.registerOre("burntQuartz", ModBlocks.DECORATIVE_BLOCKS.newItemStack(1, 2));

src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java

@@ -134,7 +134,7 @@ public Item getTabIconItem() {
                 .getItem();
         }
 
-        public static final ItemStack ICON_ITEM = new ItemStack(ModItems.GOURMANDS_AXE.get());
+        public static final ItemStack ICON_ITEM = new ItemStack(ModItems.SATING_AXE.get());
 
         @Override
         public ItemStack getIconItemStack() {

src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java

@@ -46,12 +46,12 @@ public static void IMCSender() {
             sendInfoPage("utilitiesinexcess:inverted_ingot", "uie.nei.infopage.ticon_inverted");
         }
 
-        sendInfoPage("<utilitiesinexcess:gourmands_axe>", "uie.nei.infopage.gourmands_axe.1");
-        sendInfoPage("<utilitiesinexcess:destruction_pickaxe>", "uie.nei.infopage.destruction_pickaxe.1");
+        sendInfoPage("<utilitiesinexcess:sating_axe>", "uie.nei.infopage.sating_axe.1");
+        sendInfoPage("<utilitiesinexcess:erasure_pickaxe>", "uie.nei.infopage.erasure_pickaxe.1");
         sendInfoPage("<utilitiesinexcess:anti_gravity_shovel>", "uie.nei.infopage.anti_gravity_shovel.1");
-        sendInfoPage("<utilitiesinexcess:precision_shears>", "uie.nei.infopage.precision_shears.1");
-        sendInfoPage("<utilitiesinexcess:etheric_sword>", "uie.nei.infopage.etheric_sword.1");
-        sendInfoPage("<utilitiesinexcess:reversing_hoe>", "uie.nei.infopage.reversing_hoe.1");
+        sendInfoPage("<utilitiesinexcess:recall_shears>", "uie.nei.infopage.recall_shears.1");
+        sendInfoPage("<utilitiesinexcess:liminal_sword>", "uie.nei.infopage.liminal_sword.1");
+        sendInfoPage("<utilitiesinexcess:retrograde_hoe>", "uie.nei.infopage.retrograde_hoe.1");
 
         sendInfoPage(
             "utilitiesinexcess:filing_cabinet,<utilitiesinexcess:capacity_upgrade>",
@@ -67,16 +67,16 @@ public static void IMCSender() {
             "uie.nei.infopage.filing_cabinet.4");
 
         sendInfoPage(
-            "<utilitiesinexcess:architects_wand>,<utilitiesinexcess:super_architects_wand>",
-            "uie.nei.infopage.architects_wand.1");
+            "<utilitiesinexcess:builders_wand>,<utilitiesinexcess:super_builders_wand>",
+            "uie.nei.infopage.builders_wand.1");
 
         if (Mods.Backhand.isLoaded()) {
             sendInfoPage(
-                "<utilitiesinexcess:architects_wand>,<utilitiesinexcess:super_architects_wand>",
-                "uie.nei.infopage.architects_wand.2");
+                "<utilitiesinexcess:builders_wand>,<utilitiesinexcess:super_builders_wand>",
+                "uie.nei.infopage.builders_wand.2");
             if (Mods.GT.isLoaded()) sendInfoPage(
-                "<utilitiesinexcess:architects_wand>,<utilitiesinexcess:super_architects_wand>",
-                "uie.nei.infopage.architects_wand.3");
+                "<utilitiesinexcess:builders_wand>,<utilitiesinexcess:super_builders_wand>",
+                "uie.nei.infopage.builders_wand.3");
         }
         sendInfoPage("<utilitiesinexcess:mob_jar>", "uie.nei.infopage.mob_jar.1");
 

src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java → src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemBuildersWand.java

@@ -1,6 +1,6 @@
 package com.fouristhenumber.utilitiesinexcess.common.items;
 
-import static com.fouristhenumber.utilitiesinexcess.utils.ArchitectsWandUtils.damageBackhand;
+import static com.fouristhenumber.utilitiesinexcess.utils.BuildersWandUtils.damageBackhand;
 
 import java.util.List;
 import java.util.Set;
@@ -23,24 +23,24 @@
 
 import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.WireframeRenderer;
-import com.fouristhenumber.utilitiesinexcess.config.items.ArchitectsWandsConfig;
-import com.fouristhenumber.utilitiesinexcess.utils.ArchitectsSelection;
-import com.fouristhenumber.utilitiesinexcess.utils.ArchitectsWandUtils;
-import com.fouristhenumber.utilitiesinexcess.utils.ArchitectsWandUtils.WandAxisMode;
+import com.fouristhenumber.utilitiesinexcess.config.items.BuildersWandsConfig;
+import com.fouristhenumber.utilitiesinexcess.utils.BuildersSelection;
+import com.fouristhenumber.utilitiesinexcess.utils.BuildersWandUtils;
+import com.fouristhenumber.utilitiesinexcess.utils.BuildersWandUtils.WandAxisMode;
 import com.gtnewhorizon.gtnhlib.api.ITranslucentItem;
 import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemArchitectsWand extends Item implements ITranslucentItem {
+public class ItemBuildersWand extends Item implements ITranslucentItem {
 
     public int buildLimit;
 
-    public ItemArchitectsWand(int buildLimit) {
+    public ItemBuildersWand(int buildLimit) {
         super();
         this.buildLimit = buildLimit;
-        setUnlocalizedName("architects_wand");
+        setUnlocalizedName("builders_wand");
         setMaxDamage(0);
         setMaxStackSize(1);
     }
@@ -49,7 +49,7 @@ public ItemArchitectsWand(int buildLimit) {
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean p_77624_4_) {
         tooltip.add(
             EnumChatFormatting.AQUA
-                + StatCollector.translateToLocalFormatted("uie.desc.item.architects_wand.1", this.buildLimit));
+                + StatCollector.translateToLocalFormatted("uie.desc.item.builders_wand.1", this.buildLimit));
         super.addInformation(stack, player, tooltip, p_77624_4_);
     }
 
@@ -85,27 +85,27 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int slot, bool
         ForgeDirection forgeSide = ForgeDirection.getOrientation(side);
         if (forgeSide == ForgeDirection.UNKNOWN) {
             UtilitiesInExcess.LOG
-                .warn("Architect wand onUpdate was called with invalid facing direction: {}", forgeSide);
+                .warn("Builder's wand onUpdate was called with invalid facing direction: {}", forgeSide);
             return;
         }
 
         WandAxisMode axisMode;
-        if (UtilitiesInExcess.proxy.ARCHITECTS_KEYBIND_H.isKeyDown(player)) {
+        if (UtilitiesInExcess.proxy.BUILDERS_KEYBIND_H.isKeyDown(player)) {
             axisMode = WandAxisMode.HORIZONTAL;
-        } else if (UtilitiesInExcess.proxy.ARCHITECTS_KEYBIND_V.isKeyDown(player)) {
+        } else if (UtilitiesInExcess.proxy.BUILDERS_KEYBIND_V.isKeyDown(player)) {
             axisMode = WandAxisMode.VERTICAL;
         } else {
             axisMode = WandAxisMode.FREE;
         }
 
         // 4. Target block to place
-        ArchitectsSelection selection = new ArchitectsSelection(player, world, movingObjectPosition);
+        BuildersSelection selection = new BuildersSelection(player, world, movingObjectPosition);
         List<ItemStack> itemStackToPlace = selection.blockToPlace(player);
 
         // 3. Total amount to place
         int placeCount = selection.maxPlaceCount(player, buildLimit);
 
-        Set<BlockPos> blocksToPlace = ArchitectsWandUtils.findAdjacentBlocks(
+        Set<BlockPos> blocksToPlace = BuildersWandUtils.findAdjacentBlocks(
             world,
             itemStackToPlace,
             placeCount,
@@ -164,28 +164,28 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world,
         ForgeDirection forgeSide = ForgeDirection.getOrientation(side);
         if (forgeSide == ForgeDirection.UNKNOWN) {
             UtilitiesInExcess.LOG
-                .warn("Architects wand onItemUse was called with invalid facing direction: {}", forgeSide);
+                .warn("Builder's wand onItemUse was called with invalid facing direction: {}", forgeSide);
             return false;
         }
 
         BlockPos target = new BlockPos(x, y, z);
         MovingObjectPosition mop = new MovingObjectPosition(x, y, z, side, Vec3.createVectorHelper(hitX, hitY, hitZ));
-        ArchitectsSelection selection = new ArchitectsSelection(player, world, mop);
+        BuildersSelection selection = new BuildersSelection(player, world, mop);
 
         List<ItemStack> itemStackToPlace = selection.blockToPlace(player);
 
         WandAxisMode axisMode;
-        if (UtilitiesInExcess.proxy.ARCHITECTS_KEYBIND_H.isKeyDown(player)) {
+        if (UtilitiesInExcess.proxy.BUILDERS_KEYBIND_H.isKeyDown(player)) {
             axisMode = WandAxisMode.HORIZONTAL;
-        } else if (UtilitiesInExcess.proxy.ARCHITECTS_KEYBIND_V.isKeyDown(player)) {
+        } else if (UtilitiesInExcess.proxy.BUILDERS_KEYBIND_V.isKeyDown(player)) {
             axisMode = WandAxisMode.VERTICAL;
         } else {
             axisMode = WandAxisMode.FREE;
         }
 
         int placeCount = selection.maxPlaceCount(player, buildLimit);
 
-        Set<BlockPos> blocksToPlace = ArchitectsWandUtils.findAdjacentBlocks(
+        Set<BlockPos> blocksToPlace = BuildersWandUtils.findAdjacentBlocks(
             world,
             itemStackToPlace,
             placeCount,
@@ -207,8 +207,8 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world,
                         .nextInt(candidates.size()));
             }
 
-            if (player.capabilities.isCreativeMode || (ArchitectsWandUtils.decreaseFromInventory(player, nowPlacing)
-                && damageBackhand(ArchitectsWandsConfig.INSTANCE.damageTrowelWithArchitectsWand, player))) {
+            if (player.capabilities.isCreativeMode || (BuildersWandUtils.decreaseFromInventory(player, nowPlacing)
+                && damageBackhand(BuildersWandsConfig.INSTANCE.damageTrowelWithBuildersWand, player))) {
                 placeBlock(world, player, nowPlacing, pos, side, hitX, hitY, hitZ, forgeSide);
             }
         }