diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java index 513034cc5..0e35bc257 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java +++ b/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(); } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java index e08efe908..a82b963c1 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java +++ b/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"), diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java index 336070d3b..6109186be 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java +++ b/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)); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java index c20cca069..7741babd9 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java +++ b/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() { diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java index c0e3b6294..9cdf46ce4 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java +++ b/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("", "uie.nei.infopage.gourmands_axe.1"); - sendInfoPage("", "uie.nei.infopage.destruction_pickaxe.1"); + sendInfoPage("", "uie.nei.infopage.sating_axe.1"); + sendInfoPage("", "uie.nei.infopage.erasure_pickaxe.1"); sendInfoPage("", "uie.nei.infopage.anti_gravity_shovel.1"); - sendInfoPage("", "uie.nei.infopage.precision_shears.1"); - sendInfoPage("", "uie.nei.infopage.etheric_sword.1"); - sendInfoPage("", "uie.nei.infopage.reversing_hoe.1"); + sendInfoPage("", "uie.nei.infopage.recall_shears.1"); + sendInfoPage("", "uie.nei.infopage.liminal_sword.1"); + sendInfoPage("", "uie.nei.infopage.retrograde_hoe.1"); sendInfoPage( "utilitiesinexcess:filing_cabinet,", @@ -67,16 +67,16 @@ public static void IMCSender() { "uie.nei.infopage.filing_cabinet.4"); sendInfoPage( - ",", - "uie.nei.infopage.architects_wand.1"); + ",", + "uie.nei.infopage.builders_wand.1"); if (Mods.Backhand.isLoaded()) { sendInfoPage( - ",", - "uie.nei.infopage.architects_wand.2"); + ",", + "uie.nei.infopage.builders_wand.2"); if (Mods.GT.isLoaded()) sendInfoPage( - ",", - "uie.nei.infopage.architects_wand.3"); + ",", + "uie.nei.infopage.builders_wand.3"); } sendInfoPage("", "uie.nei.infopage.mob_jar.1"); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemBuildersWand.java similarity index 80% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemBuildersWand.java index 40767636f..fe16f275d 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java +++ b/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 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 itemStackToPlace = selection.blockToPlace(player); // 3. Total amount to place int placeCount = selection.maxPlaceCount(player, buildLimit); - Set blocksToPlace = ArchitectsWandUtils.findAdjacentBlocks( + Set blocksToPlace = BuildersWandUtils.findAdjacentBlocks( world, itemStackToPlace, placeCount, @@ -164,20 +164,20 @@ 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 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; @@ -185,7 +185,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int placeCount = selection.maxPlaceCount(player, buildLimit); - Set blocksToPlace = ArchitectsWandUtils.findAdjacentBlocks( + Set 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); } } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemErasurePickaxe.java similarity index 70% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemErasurePickaxe.java index 39241af4d..1903e3350 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemErasurePickaxe.java @@ -15,7 +15,7 @@ import net.minecraftforge.event.world.BlockEvent; import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.DestructionPickaxeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.ErasurePickaxeConfig; import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber; import com.gtnewhorizon.gtnhlib.util.data.BlockMeta; @@ -23,20 +23,20 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -public class ItemDestructionPickaxe extends ItemPickaxe implements ITranslucentItem { +public class ItemErasurePickaxe extends ItemPickaxe implements ITranslucentItem { - public ItemDestructionPickaxe() { + public ItemErasurePickaxe() { super(ToolMaterial.EMERALD); - setTextureName("utilitiesinexcess:destruction_pickaxe"); - setUnlocalizedName("destruction_pickaxe"); - if (DestructionPickaxeConfig.INSTANCE.unbreakable) setMaxDamage(0); + setTextureName("utilitiesinexcess:erasure_pickaxe"); + setUnlocalizedName("erasure_pickaxe"); + if (ErasurePickaxeConfig.INSTANCE.unbreakable) setMaxDamage(0); } public static final Set affectedBlockCache = new HashSet<>(); public static void initializeCache() { - if (DestructionPickaxeConfig.INSTANCE.includeEffective != null) { - for (String blockString : DestructionPickaxeConfig.INSTANCE.includeEffective) { + if (ErasurePickaxeConfig.INSTANCE.includeEffective != null) { + for (String blockString : ErasurePickaxeConfig.INSTANCE.includeEffective) { if (blockString == null) continue; try { String[] split = blockString.trim() @@ -48,15 +48,14 @@ public static void initializeCache() { Block block = GameRegistry.findBlock(domain, name); if (block == null) { - UtilitiesInExcess.LOG - .warn("Destruction Pickaxe Config: Could not find {}, skipped", blockString); + UtilitiesInExcess.LOG.warn("Erasure Pickaxe Config: Could not find {}, skipped", blockString); continue; } affectedBlockCache.add(new BlockMeta(block, meta)); } catch (Exception e) { - UtilitiesInExcess.LOG.warn("Destruction Pickaxe Config: Skipped malformed config: {}", blockString); + UtilitiesInExcess.LOG.warn("Erasure Pickaxe Config: Skipped malformed config: {}", blockString); } } } @@ -78,34 +77,34 @@ public float getDigSpeed(ItemStack stack, Block block, int meta) { BlockMeta wildcardMatch = new BlockMeta(block, -1); if (affectedBlockCache.contains(exactMatch) || affectedBlockCache.contains(wildcardMatch)) { - return efficiencyOnProperMaterial * DestructionPickaxeConfig.INSTANCE.effectiveSpeedModifier; + return efficiencyOnProperMaterial * ErasurePickaxeConfig.INSTANCE.effectiveSpeedModifier; } else { - return efficiencyOnProperMaterial * DestructionPickaxeConfig.INSTANCE.ineffectiveSpeedModifier; + return efficiencyOnProperMaterial * ErasurePickaxeConfig.INSTANCE.ineffectiveSpeedModifier; } } @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (DestructionPickaxeConfig.INSTANCE.unbreakable) + if (ErasurePickaxeConfig.INSTANCE.unbreakable) tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("uie.desc.item.unbreakable")); } // Unbreakable @Override public boolean isDamageable() { - if (DestructionPickaxeConfig.INSTANCE.unbreakable) return false; + if (ErasurePickaxeConfig.INSTANCE.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (DestructionPickaxeConfig.INSTANCE.unbreakable) return false; + if (ErasurePickaxeConfig.INSTANCE.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (DestructionPickaxeConfig.INSTANCE.unbreakable) return false; + if (ErasurePickaxeConfig.INSTANCE.unbreakable) return false; return super.showDurabilityBar(stack); } // @@ -116,17 +115,17 @@ public static class Events { @EventBusSubscriber.Condition public static boolean shouldSubscribe() { - return DestructionPickaxeConfig.INSTANCE.enable; + return ErasurePickaxeConfig.INSTANCE.enable; } @SubscribeEvent public static void onBlockBroken(BlockEvent.HarvestDropsEvent event) { - if (!DestructionPickaxeConfig.INSTANCE.voidMinedBlock) return; + if (!ErasurePickaxeConfig.INSTANCE.voidMinedBlock) return; if (event.harvester == null) return; if (event.harvester.getHeldItem() == null) return; if (event.harvester.getHeldItem() - .getItem() instanceof ItemDestructionPickaxe) { + .getItem() instanceof ItemErasurePickaxe) { event.drops.clear(); } } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemLiminalSword.java similarity index 82% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemLiminalSword.java index 6127a5229..e387fa317 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemLiminalSword.java @@ -13,22 +13,22 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.EthericSwordConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.LiminalSwordConfig; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorEntityLivingBase; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorItemSword; import com.google.common.collect.Multimap; import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; -public class ItemEthericSword extends ItemSword implements ITranslucentItem { +public class ItemLiminalSword extends ItemSword implements ITranslucentItem { private static final UUID MAGIC_DMG_UUID = UUID.randomUUID(); - public ItemEthericSword() { + public ItemLiminalSword() { super(ToolMaterial.EMERALD); - setTextureName("utilitiesinexcess:etheric_sword"); - setUnlocalizedName("etheric_sword"); - if (EthericSwordConfig.INSTANCE.unbreakable) setMaxDamage(0); - ((AccessorItemSword) this).setDamageVsEntity(EthericSwordConfig.INSTANCE.normalDamage); + setTextureName("utilitiesinexcess:liminal_sword"); + setUnlocalizedName("liminal_sword"); + if (LiminalSwordConfig.INSTANCE.unbreakable) setMaxDamage(0); + ((AccessorItemSword) this).setDamageVsEntity(LiminalSwordConfig.INSTANCE.normalDamage); } @Override @@ -43,7 +43,7 @@ public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingB && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null && target instanceof EntityLivingBase; - float magicDamage = EthericSwordConfig.INSTANCE.magicDamage; + float magicDamage = LiminalSwordConfig.INSTANCE.magicDamage; if (isCrit) magicDamage *= 1.5f; AccessorEntityLivingBase acTarget = (AccessorEntityLivingBase) target; float cd = acTarget.getLastDamage(); @@ -61,7 +61,7 @@ public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingB @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (EthericSwordConfig.INSTANCE.unbreakable) { + if (LiminalSwordConfig.INSTANCE.unbreakable) { tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("uie.desc.item.unbreakable")); } } @@ -74,7 +74,7 @@ public Multimap getAttributeModifiers(ItemStack stack new AttributeModifier( MAGIC_DMG_UUID, "utilitiesinexcess.magic_damage", - EthericSwordConfig.INSTANCE.magicDamage, + LiminalSwordConfig.INSTANCE.magicDamage, 0)); return multimap; } @@ -82,19 +82,19 @@ public Multimap getAttributeModifiers(ItemStack stack // Unbreakable @Override public boolean isDamageable() { - if (EthericSwordConfig.INSTANCE.unbreakable) return false; + if (LiminalSwordConfig.INSTANCE.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (EthericSwordConfig.INSTANCE.unbreakable) return false; + if (LiminalSwordConfig.INSTANCE.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (EthericSwordConfig.INSTANCE.unbreakable) return false; + if (LiminalSwordConfig.INSTANCE.unbreakable) return false; return super.showDurabilityBar(stack); } // diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRecallShears.java similarity index 84% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRecallShears.java index a7db17f20..f66ccab91 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRecallShears.java @@ -19,22 +19,22 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.world.BlockEvent; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.PrecisionShearsConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.RecallShearsConfig; import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -public class ItemPrecisionShears extends ItemShears implements ITranslucentItem { +public class ItemRecallShears extends ItemShears implements ITranslucentItem { public static final String COOLDOWN_NBT_TAG = "uie:cooldown"; private IIcon cooldownIcon; - public ItemPrecisionShears() { - setTextureName("utilitiesinexcess:precision_shears"); - setUnlocalizedName("precision_shears"); - if (PrecisionShearsConfig.INSTANCE.unbreakable) setMaxDamage(0); - int harvestLevel = PrecisionShearsConfig.INSTANCE.toolLevel; + public ItemRecallShears() { + setTextureName("utilitiesinexcess:recall_shears"); + setUnlocalizedName("recall_shears"); + if (RecallShearsConfig.INSTANCE.unbreakable) setMaxDamage(0); + int harvestLevel = RecallShearsConfig.INSTANCE.toolLevel; setHarvestLevel("pickaxe", harvestLevel); setHarvestLevel("axe", harvestLevel); setHarvestLevel("shovel", harvestLevel); @@ -65,10 +65,10 @@ public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, return super.onItemUse(itemStack, player, world, x, y, z, side, clickX, clickY, clickZ); if (!world.isRemote && block.removedByPlayer(world, player, x, y, z, true)) { block.harvestBlock(world, player, x, y, z, meta); - nbt.setInteger(COOLDOWN_NBT_TAG, PrecisionShearsConfig.INSTANCE.cooldown); + nbt.setInteger(COOLDOWN_NBT_TAG, RecallShearsConfig.INSTANCE.cooldown); itemStack.setTagCompound(nbt); - if (!PrecisionShearsConfig.INSTANCE.unbreakable) itemStack.damageItem(1, player); - } else if (PrecisionShearsConfig.INSTANCE.spawnParticles) { + if (!RecallShearsConfig.INSTANCE.unbreakable) itemStack.damageItem(1, player); + } else if (RecallShearsConfig.INSTANCE.spawnParticles) { world.spawnParticle("smoke", x + 0.5d, y + 0.5d, z + 0.5d, 0.0D, 0.0D, 0.0D); } return super.onItemUse(itemStack, player, world, x, y, z, side, clickX, clickY, clickZ); @@ -77,7 +77,7 @@ public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, @Override public float getDigSpeed(ItemStack itemstack, Block block, int metadata) { if (ForgeHooks.isToolEffective(itemstack, block, metadata)) { - return PrecisionShearsConfig.INSTANCE.efficiency; + return RecallShearsConfig.INSTANCE.efficiency; } else { return super.getDigSpeed(itemstack, block, metadata); } @@ -86,7 +86,7 @@ public float getDigSpeed(ItemStack itemstack, Block block, int metadata) { @Override public void registerIcons(IIconRegister register) { super.registerIcons(register); - cooldownIcon = register.registerIcon("utilitiesinexcess:precision_shears_cooldown"); + cooldownIcon = register.registerIcon("utilitiesinexcess:recall_shears_cooldown"); } @Override @@ -102,26 +102,26 @@ public IIcon getIcon(ItemStack stack, int pass) { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (PrecisionShearsConfig.INSTANCE.unbreakable) + if (RecallShearsConfig.INSTANCE.unbreakable) tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("uie.desc.item.unbreakable")); } // Unbreakable @Override public boolean isDamageable() { - if (PrecisionShearsConfig.INSTANCE.unbreakable) return false; + if (RecallShearsConfig.INSTANCE.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (PrecisionShearsConfig.INSTANCE.unbreakable) return false; + if (RecallShearsConfig.INSTANCE.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (PrecisionShearsConfig.INSTANCE.unbreakable) return false; + if (RecallShearsConfig.INSTANCE.unbreakable) return false; return super.showDurabilityBar(stack); } // @@ -132,7 +132,7 @@ public static class Events { @EventBusSubscriber.Condition public static boolean shouldSubscribe() { - return PrecisionShearsConfig.INSTANCE.enable; + return RecallShearsConfig.INSTANCE.enable; } @SubscribeEvent @@ -141,7 +141,7 @@ public static void onBlockBroken(BlockEvent.HarvestDropsEvent event) { if (event.harvester.getHeldItem() == null) return; if (event.harvester.getHeldItem() - .getItem() instanceof ItemPrecisionShears) { + .getItem() instanceof ItemRecallShears) { EntityPlayer player = event.harvester; AxisAlignedBB dropSearchArea = AxisAlignedBB diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRetrogradeHoe.java similarity index 79% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRetrogradeHoe.java index fe53739bf..4550b9e8a 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemRetrogradeHoe.java @@ -13,31 +13,30 @@ import net.minecraft.world.World; import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.ReversingHoeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.RetrogradeHoeConfig; import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; import com.gtnewhorizon.gtnhlib.util.data.BlockMeta; import cpw.mods.fml.common.registry.GameRegistry; -// TODO: Add new features to the reversing hoe -public class ItemReversingHoe extends ItemHoe implements ITranslucentItem { +public class ItemRetrogradeHoe extends ItemHoe implements ITranslucentItem { public static final HashMap blockConversionCache = new HashMap<>(); - public ItemReversingHoe() { + public ItemRetrogradeHoe() { super(ToolMaterial.EMERALD); - setTextureName("utilitiesinexcess:reversing_hoe"); - setUnlocalizedName("reversing_hoe"); - if (ReversingHoeConfig.INSTANCE.unbreakable) setMaxDamage(0); + setTextureName("utilitiesinexcess:retrograde_hoe"); + setUnlocalizedName("retrograde_hoe"); + if (RetrogradeHoeConfig.INSTANCE.unbreakable) setMaxDamage(0); } public static void initializeCache() { - if (ReversingHoeConfig.INSTANCE.blockTransformations != null) { - for (String transformation : ReversingHoeConfig.INSTANCE.blockTransformations) { + if (RetrogradeHoeConfig.INSTANCE.blockTransformations != null) { + for (String transformation : RetrogradeHoeConfig.INSTANCE.blockTransformations) { if (transformation == null) continue; if (!transformation.contains("->")) { UtilitiesInExcess.LOG - .warn("Reversing Hoe Config: {} does not contain '->', skipped", transformation); + .warn("Retrograde Hoe Config: {} does not contain '->', skipped", transformation); continue; } try { @@ -59,7 +58,7 @@ public static void initializeCache() { Block targetBlock = GameRegistry.findBlock(targetDomain, targetName); if (sourceBlock == null || targetBlock == null) { - UtilitiesInExcess.LOG.warn("Reversing Hoe Config: Could not find {}, skipped", transformation); + UtilitiesInExcess.LOG.warn("Retrograde Hoe Config: Could not find {}, skipped", transformation); continue; } @@ -67,7 +66,7 @@ public static void initializeCache() { .put(new BlockMeta(sourceBlock, sourceMeta), new BlockMeta(targetBlock, targetMeta)); } catch (Exception e) { - UtilitiesInExcess.LOG.warn("Reversing Hoe Config: Skipped malformed config: {}", transformation); + UtilitiesInExcess.LOG.warn("Retrograde Hoe Config: Skipped malformed config: {}", transformation); } } } @@ -98,7 +97,7 @@ public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, if (!world.isRemote) { world.setBlock(x, y, z, targetBlock, targetMeta, 3); - if (!ReversingHoeConfig.INSTANCE.unbreakable) { + if (!RetrogradeHoeConfig.INSTANCE.unbreakable) { itemStack.damageItem(1, player); } } @@ -120,26 +119,26 @@ else if (block == Blocks.wheat || block == Blocks.potatoes || block == Blocks.ca @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (ReversingHoeConfig.INSTANCE.unbreakable) + if (RetrogradeHoeConfig.INSTANCE.unbreakable) tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("uie.desc.item.unbreakable")); } // Unbreakable @Override public boolean isDamageable() { - if (ReversingHoeConfig.INSTANCE.unbreakable) return false; + if (RetrogradeHoeConfig.INSTANCE.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (ReversingHoeConfig.INSTANCE.unbreakable) return false; + if (RetrogradeHoeConfig.INSTANCE.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (ReversingHoeConfig.INSTANCE.unbreakable) return false; + if (RetrogradeHoeConfig.INSTANCE.unbreakable) return false; return super.showDurabilityBar(stack); } // diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemSatingAxe.java similarity index 76% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemSatingAxe.java index 7891c8570..f9f693073 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemSatingAxe.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.world.BlockEvent; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.GourmandsAxeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.SatingAxeConfig; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorEntityZombie; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorItemTool; import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; @@ -25,20 +25,20 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; -public class ItemGourmandsAxe extends ItemAxe implements ITranslucentItem { +public class ItemSatingAxe extends ItemAxe implements ITranslucentItem { - public ItemGourmandsAxe() { + public ItemSatingAxe() { super(ToolMaterial.EMERALD); - setTextureName("utilitiesinexcess:gourmands_axe"); - setUnlocalizedName("gourmands_axe"); - if (GourmandsAxeConfig.INSTANCE.unbreakable) setMaxDamage(0); - ((AccessorItemTool) this).setDamageVsEntity(GourmandsAxeConfig.INSTANCE.damageAgainstUndead); + setTextureName("utilitiesinexcess:sating_axe"); + setUnlocalizedName("sating_axe"); + if (SatingAxeConfig.INSTANCE.unbreakable) setMaxDamage(0); + ((AccessorItemTool) this).setDamageVsEntity(SatingAxeConfig.INSTANCE.damageAgainstUndead); } private static final Random particleRandom = new Random();; public static void spawnParticles(Entity e) { - if (!GourmandsAxeConfig.INSTANCE.spawnParticles) return; + if (!SatingAxeConfig.INSTANCE.spawnParticles) return; int ci = Potion.potionTypes[Potion.heal.getId()].getLiquidColor(); double d0 = (double) (ci >> 16 & 255) / 255.0D; double d1 = (double) (ci >> 8 & 255) / 255.0D; @@ -63,7 +63,7 @@ public void onUpdate(ItemStack s, World w, Entity e, int slot, boolean selected) if (e instanceof EntityPlayer p && selected) { if (w.getTotalWorldTime() % (2 * 20) == 0) { FoodStats fs = p.getFoodStats(); - fs.addStats(GourmandsAxeConfig.INSTANCE.foodGain, GourmandsAxeConfig.INSTANCE.saturationGain); + fs.addStats(SatingAxeConfig.INSTANCE.foodGain, SatingAxeConfig.INSTANCE.saturationGain); } } } @@ -85,11 +85,10 @@ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer attacker, Entity } if (!target.isEntityUndead()) { - float amountToHeal = Math - .min(GourmandsAxeConfig.INSTANCE.maxHeal, target.getMaxHealth() - target.getHealth()); - if (amountToHeal == 0) if (GourmandsAxeConfig.INSTANCE.useHungerAlways) attacker.addExhaustion(3 * 4); + float amountToHeal = Math.min(SatingAxeConfig.INSTANCE.maxHeal, target.getMaxHealth() - target.getHealth()); + if (amountToHeal == 0) if (SatingAxeConfig.INSTANCE.useHungerAlways) attacker.addExhaustion(3 * 4); else { - if (GourmandsAxeConfig.INSTANCE.drainHp) if (attacker.getHealth() >= amountToHeal + 1) + if (SatingAxeConfig.INSTANCE.drainHp) if (attacker.getHealth() >= amountToHeal + 1) attacker.setHealth(attacker.getHealth() - amountToHeal); else return true; target.setHealth(target.getHealth() + (amountToHeal + 1)); @@ -105,26 +104,26 @@ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer attacker, Entity @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (GourmandsAxeConfig.INSTANCE.unbreakable) + if (SatingAxeConfig.INSTANCE.unbreakable) tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("uie.desc.item.unbreakable")); } // Unbreakable @Override public boolean isDamageable() { - if (GourmandsAxeConfig.INSTANCE.unbreakable) return false; + if (SatingAxeConfig.INSTANCE.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (GourmandsAxeConfig.INSTANCE.unbreakable) return false; + if (SatingAxeConfig.INSTANCE.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (GourmandsAxeConfig.INSTANCE.unbreakable) return false; + if (SatingAxeConfig.INSTANCE.unbreakable) return false; return super.showDurabilityBar(stack); } // @@ -135,17 +134,17 @@ public static class Events { @EventBusSubscriber.Condition public static boolean shouldSubscribe() { - return GourmandsAxeConfig.INSTANCE.enable; + return SatingAxeConfig.INSTANCE.enable; } @SubscribeEvent public static void onBlockBroken(BlockEvent.HarvestDropsEvent event) { - if (!GourmandsAxeConfig.INSTANCE.voidMinedBlock) return; + if (!SatingAxeConfig.INSTANCE.voidMinedBlock) return; if (event.harvester == null) return; if (event.harvester.getHeldItem() == null) return; if (event.harvester.getHeldItem() - .getItem() instanceof ItemGourmandsAxe) { + .getItem() instanceof ItemSatingAxe) { event.drops.clear(); } } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java index bda1aaf83..d96658ca8 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java @@ -1375,9 +1375,9 @@ private static void loadInversionRecipes() { 'n', ModItems.INVERTED_NUGGET); - // Gourmand's Axe - if (RecipeConfig.enableGourmandsAxeRecipe) addShapedRecipe( - ModItems.GOURMANDS_AXE, + // Sating Axe + if (RecipeConfig.enableSatingAxeRecipe) addShapedRecipe( + ModItems.SATING_AXE, "ii", "is", " s", @@ -1386,9 +1386,9 @@ private static void loadInversionRecipes() { 's', Blocks.obsidian); - // Destruction Pickaxe - if (RecipeConfig.enableDestructionPickaxeRecipe) addShapedRecipe( - ModItems.DESTRUCTION_PICKAXE, + // Erasure Pickaxe + if (RecipeConfig.enableErasurePickaxeRecipe) addShapedRecipe( + ModItems.ERASURE_PICKAXE, "iii", " s ", " s ", @@ -1397,9 +1397,9 @@ private static void loadInversionRecipes() { 's', Blocks.obsidian); - // Reversing Hoe - if (RecipeConfig.enableReversingHoeRecipe) addShapedRecipe( - ModItems.REVERSING_HOE, + // Retrograde Hoe + if (RecipeConfig.enableRetrogradeHoeRecipe) addShapedRecipe( + ModItems.RETROGRADE_HOE, "ii", " s", " s", @@ -1419,9 +1419,9 @@ private static void loadInversionRecipes() { 's', Blocks.obsidian); - // Etheric Sword - if (RecipeConfig.enableEthericSwordRecipe) addShapedRecipe( - ModItems.ETHERIC_SWORD, + // Liminal Sword + if (RecipeConfig.enableLiminalSwordRecipe) addShapedRecipe( + ModItems.LIMINAL_SWORD, "i", "i", "s", @@ -1439,11 +1439,11 @@ private static void loadInversionRecipes() { 'i', ModItems.INVERTED_INGOT.newItemStack(1, 2), 's', - ModItems.ETHERIC_SWORD); + ModItems.LIMINAL_SWORD); - // Precision Shears - if (RecipeConfig.enablePrecisionShearsRecipe) addShapedRecipe( - ModItems.PRECISION_SHEARS, + // Recall Shears + if (RecipeConfig.enableRecallShearsRecipe) addShapedRecipe( + ModItems.RECALL_SHEARS, "fi", "if", 'i', @@ -1451,9 +1451,9 @@ private static void loadInversionRecipes() { 'f', ModBlocks.HEAVENLY_BLOCK); - // Architect's Wand - if (RecipeConfig.enableArchitectsWandRecipe) addShapedRecipe( - ModItems.ARCHITECTS_WAND, + // Builder's Wand + if (RecipeConfig.enableBuildersWandRecipe) addShapedRecipe( + ModItems.BUILDERS_WAND, " i", "s ", 'i', @@ -1461,15 +1461,15 @@ private static void loadInversionRecipes() { 's', Blocks.obsidian); - // Super Architect's Wand - if (RecipeConfig.enableSuperArchitectsWandRecipe) addShapedRecipe( - ModItems.SUPER_ARCHITECTS_WAND, + // Super Builder's Wand + if (RecipeConfig.enableSuperBuildersWandRecipe) addShapedRecipe( + ModItems.SUPER_BUILDERS_WAND, " i", "s ", 'i', ModItems.BEDROCKIUM_INGOT, 's', - ModItems.ARCHITECTS_WAND); + ModItems.BUILDERS_WAND); // Inverted Ingot -> Block if (RecipeConfig.enableInvertedBlockRecipe) addShapedRecipe( diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/WireframeRenderer.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/WireframeRenderer.java index c4d6941c3..8eef092c1 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/WireframeRenderer.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/WireframeRenderer.java @@ -10,8 +10,8 @@ import org.lwjgl.opengl.GL11; -import com.fouristhenumber.utilitiesinexcess.common.items.ItemArchitectsWand; -import com.fouristhenumber.utilitiesinexcess.config.items.ArchitectsWandsConfig; +import com.fouristhenumber.utilitiesinexcess.common.items.ItemBuildersWand; +import com.fouristhenumber.utilitiesinexcess.config.items.BuildersWandsConfig; import com.gtnewhorizon.gtnhlib.blockpos.BlockPos; import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber; import com.gtnewhorizon.gtnhlib.eventbus.Phase; @@ -39,7 +39,7 @@ public static void clearCandidatePositions() { @EventBusSubscriber.Condition public static boolean shouldSubscribe() { - return ArchitectsWandsConfig.INSTANCE.enableArchitectsWand; + return BuildersWandsConfig.INSTANCE.enableBuildersWand; } @SubscribeEvent @@ -47,7 +47,7 @@ public static void onRenderWorldLast(RenderWorldLastEvent event) { EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; if (player == null) return; ItemStack held = player.getHeldItem(); - if (held == null || !(held.getItem() instanceof ItemArchitectsWand)) { + if (held == null || !(held.getItem() instanceof ItemBuildersWand)) { clearCandidatePositions(); return; } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/PosteaTransforms.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/PosteaTransforms.java index 503e2c6f3..aa05f768e 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/PosteaTransforms.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/PosteaTransforms.java @@ -45,21 +45,20 @@ private static void transformItems() { ItemStackReplacementManager .addSimpleReplacement("ExtraUtilities:heatingElement", ModItems.FIRE_BATTERY.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:builderswand", ModItems.ARCHITECTS_WAND.get(), true); + .addSimpleReplacement("ExtraUtilities:builderswand", ModItems.BUILDERS_WAND.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:creativebuilderswand", ModItems.SUPER_ARCHITECTS_WAND.get(), true); + .addSimpleReplacement("ExtraUtilities:creativebuilderswand", ModItems.SUPER_BUILDERS_WAND.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:ethericsword", ModItems.ETHERIC_SWORD.get(), true); + .addSimpleReplacement("ExtraUtilities:ethericsword", ModItems.LIMINAL_SWORD.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:destructionpickaxe", ModItems.DESTRUCTION_PICKAXE.get(), true); + .addSimpleReplacement("ExtraUtilities:destructionpickaxe", ModItems.ERASURE_PICKAXE.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:defoliageAxe", ModItems.GOURMANDS_AXE.get(), true); + .addSimpleReplacement("ExtraUtilities:defoliageAxe", ModItems.SATING_AXE.get(), true); ItemStackReplacementManager .addSimpleReplacement("ExtraUtilities:erosionShovel", ModItems.ANTI_GRAVITY_SHOVEL.get(), true); ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:temporalHoe", ModItems.REVERSING_HOE.get(), true); - ItemStackReplacementManager - .addSimpleReplacement("ExtraUtilities:shears", ModItems.PRECISION_SHEARS.get(), true); + .addSimpleReplacement("ExtraUtilities:temporalHoe", ModItems.RETROGRADE_HOE.get(), true); + ItemStackReplacementManager.addSimpleReplacement("ExtraUtilities:shears", ModItems.RECALL_SHEARS.get(), true); ItemStackReplacementManager .addSimpleReplacement("ExtraUtilities:sonar_goggles", ModItems.XRAY_GLASSES.get(), true); ItemStackReplacementManager diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/nei/NEIConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/nei/NEIConfig.java index fcaad021b..e1f4b3114 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/nei/NEIConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/nei/NEIConfig.java @@ -118,8 +118,8 @@ public static void registerAliases() { new ItemStack(ModItems.PSEUDO_REVERSION_SIGIL.get()), new ItemStack(ModItems.INVERTED_INGOT.get()), new ItemStack(ModItems.INVERTED_INGOT.get(), 1, 1), - new ItemStack(ModItems.ARCHITECTS_WAND.get()), - new ItemStack(ModItems.SUPER_ARCHITECTS_WAND.get()), + new ItemStack(ModItems.BUILDERS_WAND.get()), + new ItemStack(ModItems.SUPER_BUILDERS_WAND.get()), new ItemStack(ModItems.HEAVENLY_RING_FEATHER.get()), new ItemStack(ModItems.HEAVENLY_RING_DRAGON.get()), new ItemStack(ModItems.HEAVENLY_RING_FAIRY.get()), diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/RecipeConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/RecipeConfig.java index 868b0f9e2..a4140d6ee 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/RecipeConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/RecipeConfig.java @@ -70,15 +70,15 @@ public class RecipeConfig { @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableGourmandsAxeRecipe; + public static boolean enableSatingAxeRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableDestructionPickaxeRecipe; + public static boolean enableErasurePickaxeRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableReversingHoeRecipe; + public static boolean enableRetrogradeHoeRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) @@ -86,7 +86,7 @@ public class RecipeConfig { @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableEthericSwordRecipe; + public static boolean enableLiminalSwordRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) @@ -94,15 +94,15 @@ public class RecipeConfig { @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enablePrecisionShearsRecipe; + public static boolean enableRecallShearsRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableArchitectsWandRecipe; + public static boolean enableBuildersWandRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) - public static boolean enableSuperArchitectsWandRecipe; + public static boolean enableSuperBuildersWandRecipe; @Config.RequiresMcRestart @Config.DefaultBoolean(true) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ArchitectsWandsConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/BuildersWandsConfig.java similarity index 61% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ArchitectsWandsConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/BuildersWandsConfig.java index d3b48f088..2654b8eb4 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ArchitectsWandsConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/BuildersWandsConfig.java @@ -2,41 +2,41 @@ import com.gtnewhorizon.gtnhlib.config.Config; -public class ArchitectsWandsConfig { +public class BuildersWandsConfig { @Config.Ignore - public static final ArchitectsWandsConfig INSTANCE = new ArchitectsWandsConfig(); + public static final BuildersWandsConfig INSTANCE = new BuildersWandsConfig(); @Config.Order(0) @Config.DefaultBoolean(true) @Config.RequiresMcRestart - public boolean enableArchitectsWand; + public boolean enableBuildersWand; @Config.Order(100) @Config.DefaultInt(9) @Config.RangeFloat(min = 1) @Config.Sync - public int architectsWandBuildLimit; + public int buildersWandBuildLimit; @Config.Order(200) @Config.DefaultBoolean(true) @Config.RequiresMcRestart - public boolean enableSuperArchitectsWand; + public boolean enableSuperBuildersWand; @Config.Order(300) @Config.DefaultInt(49) @Config.RangeFloat(min = 1) @Config.Sync - public int superArchitectsWandBuildLimit; + public int superBuildersWandBuildLimit; @Config.Order(400) @Config.DefaultInt(200) @Config.RangeFloat(min = 1) @Config.Sync - public int architectsWandCreativeBuildLimit; + public int buildersWandCreativeBuildLimit; @Config.Order(500) @Config.DefaultInt(100) - @Config.Comment("[GT5U] Durability damage dealt to Trowels per block placed by the Architect's Wand. (Set to 0 to disable)") - public int damageTrowelWithArchitectsWand; + @Config.Comment("[GT5U] Durability damage dealt to Trowels per block placed by the Builder's Wand. (Set to 0 to disable)") + public int damageTrowelWithBuildersWand; } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ItemConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ItemConfig.java index d2ac7a840..a3162ace1 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ItemConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/ItemConfig.java @@ -18,8 +18,8 @@ public class ItemConfig { public static final InversionConfig inversion = InversionConfig.INSTANCE; @Config.Order(200) - @Config.LangKey("uie.config.item.architects_wands") - public static final ArchitectsWandsConfig architectsWands = ArchitectsWandsConfig.INSTANCE; + @Config.LangKey("uie.config.item.builders_wands") + public static final BuildersWandsConfig buildersWands = BuildersWandsConfig.INSTANCE; @Config.Order(300) @Config.LangKey("uie.config.item.watering_can") diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/DestructionPickaxeConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ErasurePickaxeConfig.java similarity index 89% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/DestructionPickaxeConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ErasurePickaxeConfig.java index d2b981f3b..4f5717267 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/DestructionPickaxeConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ErasurePickaxeConfig.java @@ -3,11 +3,11 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.destruction_pickaxe") -public class DestructionPickaxeConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.erasure_pickaxe") +public class ErasurePickaxeConfig { @Config.Ignore - public static final DestructionPickaxeConfig INSTANCE = new DestructionPickaxeConfig(); + public static final ErasurePickaxeConfig INSTANCE = new ErasurePickaxeConfig(); @Config.DefaultBoolean(true) @Config.Name("Enable") diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/InvertedTools.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/InvertedTools.java index 17bf5f5f8..437a64731 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/InvertedTools.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/InvertedTools.java @@ -9,28 +9,28 @@ public class InvertedTools { @Config.Ignore public static final InvertedTools INSTANCE = new InvertedTools(); - @Config.LangKey("item.etheric_sword.name") + @Config.LangKey("item.liminal_sword.name") @Config.Order(0) - public final EthericSwordConfig ethericSwordConfig = EthericSwordConfig.INSTANCE; + public final LiminalSwordConfig liminalSwordConfig = LiminalSwordConfig.INSTANCE; - @Config.LangKey("item.destruction_pickaxe.name") + @Config.LangKey("item.erasure_pickaxe.name") @Config.Order(100) - public final DestructionPickaxeConfig destructionPickaxeConfig = DestructionPickaxeConfig.INSTANCE; + public final ErasurePickaxeConfig erasurePickaxeConfig = ErasurePickaxeConfig.INSTANCE; - @Config.LangKey("item.gourmands_axe.name") + @Config.LangKey("item.sating_axe.name") @Config.Order(200) - public final GourmandsAxeConfig gourmandsAxeConfig = GourmandsAxeConfig.INSTANCE; + public final SatingAxeConfig satingAxeConfig = SatingAxeConfig.INSTANCE; @Config.LangKey("item.anti_gravity_shovel.name") @Config.Order(300) public final AntiGravityShovelConfig antiGravityShovelConfig = AntiGravityShovelConfig.INSTANCE; - @Config.LangKey("item.reversing_hoe.name") + @Config.LangKey("item.retrograde_hoe.name") @Config.Order(400) - public final ReversingHoeConfig reversingHoeConfig = ReversingHoeConfig.INSTANCE; + public final RetrogradeHoeConfig retrogradeHoeConfig = RetrogradeHoeConfig.INSTANCE; - @Config.LangKey("item.precision_shears.name") + @Config.LangKey("item.recall_shears.name") @Config.Order(500) - public final PrecisionShearsConfig precisionShearsConfig = PrecisionShearsConfig.INSTANCE; + public final RecallShearsConfig recallShearsConfig = RecallShearsConfig.INSTANCE; } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/EthericSwordConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/LiminalSwordConfig.java similarity index 85% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/EthericSwordConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/LiminalSwordConfig.java index a475de6a7..555e13b0b 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/EthericSwordConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/LiminalSwordConfig.java @@ -3,11 +3,11 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.etheric_sword") -public class EthericSwordConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.liminal_sword") +public class LiminalSwordConfig { @Config.Ignore - public static final EthericSwordConfig INSTANCE = new EthericSwordConfig(); + public static final LiminalSwordConfig INSTANCE = new LiminalSwordConfig(); @Config.DefaultBoolean(true) @Config.Name("Enable") diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/PrecisionShearsConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RecallShearsConfig.java similarity index 87% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/PrecisionShearsConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RecallShearsConfig.java index ebae8c281..f520d100c 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/PrecisionShearsConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RecallShearsConfig.java @@ -3,11 +3,11 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.precision_shears") -public class PrecisionShearsConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.recall_shears") +public class RecallShearsConfig { @Config.Ignore - public static final PrecisionShearsConfig INSTANCE = new PrecisionShearsConfig(); + public static final RecallShearsConfig INSTANCE = new RecallShearsConfig(); @Config.Order(0) @Config.DefaultBoolean(true) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ReversingHoeConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RetrogradeHoeConfig.java similarity index 68% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ReversingHoeConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RetrogradeHoeConfig.java index f154e5af7..af3870844 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/ReversingHoeConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/RetrogradeHoeConfig.java @@ -3,11 +3,11 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.reversing_hoe") -public class ReversingHoeConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.retrograde_hoe") +public class RetrogradeHoeConfig { @Config.Ignore - public static final ReversingHoeConfig INSTANCE = new ReversingHoeConfig(); + public static final RetrogradeHoeConfig INSTANCE = new RetrogradeHoeConfig(); @Config.Order(0) @Config.DefaultBoolean(true) @@ -22,7 +22,7 @@ public class ReversingHoeConfig { public boolean unbreakable; @Config.Order(200) - @Config.Comment("Which block transformations the reversing hoe will work on. Format as modid:blockid:meta->modid:blockid:meta - if meta of source block is not specified, will work on any meta. If meta of target block is not specified, will transform into meta 0.") + @Config.Comment("Which block transformations the Retrograde Hoe will work on. Format as modid:blockid:meta->modid:blockid:meta - if meta of source block is not specified, will work on any meta. If meta of target block is not specified, will transform into meta 0.") @Config.DefaultStringList({ "minecraft:dirt->minecraft:grass", "minecraft:cobblestone->minecraft:stone", "utilitiesinexcess:cursed_earth->utilitiesinexcess:blessed_earth", "utilitiesinexcess:blessed_earth->utilitiesinexcess:cursed_earth" }) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/GourmandsAxeConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/SatingAxeConfig.java similarity index 91% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/GourmandsAxeConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/SatingAxeConfig.java index fb3481a4e..db57d62f5 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/GourmandsAxeConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/invertedtools/SatingAxeConfig.java @@ -3,11 +3,11 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.gourmands_axe") -public class GourmandsAxeConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.inverted_tools.sating_axe") +public class SatingAxeConfig { @Config.Ignore - public static final GourmandsAxeConfig INSTANCE = new GourmandsAxeConfig(); + public static final SatingAxeConfig INSTANCE = new SatingAxeConfig(); @Config.DefaultBoolean(true) @Config.Name("Enable") diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsSelection.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersSelection.java similarity index 90% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsSelection.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersSelection.java index 916b8e74c..9cb6254cc 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsSelection.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersSelection.java @@ -16,20 +16,20 @@ import org.jetbrains.annotations.Nullable; import com.fouristhenumber.utilitiesinexcess.compat.Mods; -import com.fouristhenumber.utilitiesinexcess.config.items.ArchitectsWandsConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.BuildersWandsConfig; import com.gtnewhorizon.gtnhlib.blockpos.BlockPos; import gregtech.api.items.MetaGeneratedTool; import gregtech.common.tools.ToolTrowel; import xonin.backhand.api.core.BackhandUtils; -public class ArchitectsSelection { +public class BuildersSelection { private final Set validBlocks; private final ItemStack backhand; private final ItemStack lookAtBlock; - public ArchitectsSelection(EntityPlayer player, World world, MovingObjectPosition movingObjectPosition) { + public BuildersSelection(EntityPlayer player, World world, MovingObjectPosition movingObjectPosition) { this.validBlocks = new HashSet<>(); backhand = Mods.Backhand.isLoaded() ? BackhandUtils.getOffhandItem(player) : null; lookAtBlock = getBlockByLocation(world, movingObjectPosition, player); @@ -73,11 +73,11 @@ public List blockToPlace(EntityPlayer player) { } public int maxPlaceCount(EntityPlayer player, int wandLimit) { - if (player.capabilities.isCreativeMode) return ArchitectsWandsConfig.INSTANCE.architectsWandCreativeBuildLimit; + if (player.capabilities.isCreativeMode) return BuildersWandsConfig.INSTANCE.buildersWandCreativeBuildLimit; int count = 0; for (ItemStack block : blockToPlace(player)) { - count += ArchitectsWandUtils.countItemInInventory(player, block); + count += BuildersWandUtils.countItemInInventory(player, block); } return Math.min(count, wandLimit); } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsWandUtils.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersWandUtils.java similarity index 88% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsWandUtils.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersWandUtils.java index 5b7594c15..20300d386 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ArchitectsWandUtils.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/BuildersWandUtils.java @@ -1,7 +1,7 @@ package com.fouristhenumber.utilitiesinexcess.utils; -import static com.fouristhenumber.utilitiesinexcess.utils.ArchitectsSelection.getBlockByLocation; -import static com.fouristhenumber.utilitiesinexcess.utils.ArchitectsSelection.isTrowel; +import static com.fouristhenumber.utilitiesinexcess.utils.BuildersSelection.getBlockByLocation; +import static com.fouristhenumber.utilitiesinexcess.utils.BuildersSelection.isTrowel; import static com.fouristhenumber.utilitiesinexcess.utils.MovingObjectPositionUtil.TranslateMovingObjectPoistionToLocation; import java.util.HashSet; @@ -24,9 +24,9 @@ import gregtech.api.items.MetaGeneratedTool; import xonin.backhand.api.core.BackhandUtils; -public class ArchitectsWandUtils { +public class BuildersWandUtils { - public ArchitectsWandUtils() {} + public BuildersWandUtils() {} ; @@ -76,16 +76,16 @@ public static boolean decreaseFromInventory(EntityPlayer player, ItemStack itemS * Finds the blocks adjacent to the start position that are connected cardinally, or diagonally * and have a placeable block (e.g. air, fluid) in front of them relative to the side clicked on. * - * @param world The world in which to place - * @param findCount The maximum amount of blocks it should search - * @param clickedSide The side of the block that was clicked - * @param startPos The position to start - * @param architectsSelection The pattern used to search adjacent blocks + * @param world The world in which to place + * @param findCount The maximum amount of blocks it should search + * @param clickedSide The side of the block that was clicked + * @param startPos The position to start + * @param buildersSelection The pattern used to search adjacent blocks * @return The set of 1<=x<=findCount adjacent blocks with air on their face */ public static Set findAdjacentBlocks(World world, List possiblePlacements, int findCount, ForgeDirection clickedSide, BlockPos startPos, MovingObjectPosition mop, EntityPlayer player, - ArchitectsSelection architectsSelection, WandAxisMode axisMode) { + BuildersSelection buildersSelection, WandAxisMode axisMode) { Set region = new HashSet<>(); if (findCount <= 0) { return region; @@ -120,7 +120,7 @@ public static Set findAdjacentBlocks(World world, List poss TranslateMovingObjectPoistionToLocation(mop, startPos); // Base case - if (IsValidForWireFrame(world, possiblePlacements, startPos, mop, player, clickedSide, architectsSelection)) { + if (IsValidForWireFrame(world, possiblePlacements, startPos, mop, player, clickedSide, buildersSelection)) { region.add(startPos); queue.add(startPos); visited.add(startPos); @@ -145,14 +145,7 @@ public static Set findAdjacentBlocks(World world, List poss // translate the mop TranslateMovingObjectPoistionToLocation(mop, key); - if (IsValidForWireFrame( - world, - possiblePlacements, - key, - mop, - player, - clickedSide, - architectsSelection)) { + if (IsValidForWireFrame(world, possiblePlacements, key, mop, player, clickedSide, buildersSelection)) { region.add(key); queue.add(key); } @@ -163,7 +156,7 @@ public static Set findAdjacentBlocks(World world, List poss } private static boolean IsValidForWireFrame(World world, List possibleBlocks, BlockPos targetLocation, - MovingObjectPosition mop, EntityPlayer player, ForgeDirection clickedSide, ArchitectsSelection selection) { + MovingObjectPosition mop, EntityPlayer player, ForgeDirection clickedSide, BuildersSelection selection) { ItemStack currentBlock = getBlockByLocation(world, mop, player); if (currentBlock == null) return false; diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/SiegeMobCreator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/SiegeMobCreator.java index 956c2976e..18249a074 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/SiegeMobCreator.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/SiegeMobCreator.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; import com.fouristhenumber.utilitiesinexcess.ModItems; -import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.EthericSwordConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.invertedtools.LiminalSwordConfig; public class SiegeMobCreator { @@ -107,7 +107,7 @@ private static void addMelee(EntityLiving mob, Random rand) { else if (rng < 70) weapon = new ItemStack(Items.iron_sword); else if (rng < 85) weapon = new ItemStack(Items.diamond_axe); else if (rng < 95) weapon = new ItemStack(Items.diamond_sword); - else weapon = EthericSwordConfig.INSTANCE.enable ? ModItems.ETHERIC_SWORD.newItemStack() + else weapon = LiminalSwordConfig.INSTANCE.enable ? ModItems.LIMINAL_SWORD.newItemStack() : new ItemStack(Items.diamond_sword); if (rand.nextInt(100) < 40) weapon.addEnchantment(Enchantment.sharpness, rand.nextInt(5) + 1); diff --git a/src/main/resources/assets/utilitiesinexcess/lang/cs_CZ.lang b/src/main/resources/assets/utilitiesinexcess/lang/cs_CZ.lang index 528802acb..c882e15c4 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/cs_CZ.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/cs_CZ.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Andělský prsten item.heavenly_ring_fairy.aliases=Andělský prsten item.heavenly_ring_dragon.aliases=Andělský prsten item.heavenly_ring_feather.aliases=Andělský prsten -item.architects_wand.aliases=Stavitelova hůlka item.pseudo_reversion_sigil.aliases=Divizní pečeť item.inversion_sigil_active.aliases=Divizní pečeť item.inversion_sigil_inactive.aliases=Divizní pečeť diff --git a/src/main/resources/assets/utilitiesinexcess/lang/de_DE.lang b/src/main/resources/assets/utilitiesinexcess/lang/de_DE.lang index 45795c7a4..944c68248 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/de_DE.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/de_DE.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Engelsring item.heavenly_ring_fairy.aliases=Engelsring item.heavenly_ring_dragon.aliases=Engelsring item.heavenly_ring_feather.aliases=Engelsring -item.architects_wand.aliases=Baumeisterstab item.pseudo_reversion_sigil.aliases=Teilungssiegel item.inversion_sigil_active.aliases=Teilungssiegel item.inversion_sigil_inactive.aliases=Teilungssiegel diff --git a/src/main/resources/assets/utilitiesinexcess/lang/en_PT.lang b/src/main/resources/assets/utilitiesinexcess/lang/en_PT.lang index 880330eb1..d6780a998 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/en_PT.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/en_PT.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Ring o' Not Fallin' item.heavenly_ring_fairy.aliases=Ring o' Not Fallin' item.heavenly_ring_dragon.aliases=Ring o' Not Fallin' item.heavenly_ring_feather.aliases=Ring o' Not Fallin' -item.architects_wand.aliases=Fast Ship Builder item.pseudo_reversion_sigil.aliases=Sigil of Fancy-Pancy Math an' Numbers item.inversion_sigil_active.aliases=Sigil of Fancy-Pancy Math an' Numbers item.inversion_sigil_inactive.aliases=Sigil of Fancy-Pancy Math an' Numbers diff --git a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang index 10917e9d2..34175a8df 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang @@ -44,15 +44,15 @@ uie.nei.infopage.inversion_sigil.4=If the ritual has been completed successfully uie.nei.infopage.pseudo_reversion_sigil.1=The Pseudo-Reversion Sigil is an improved version of the Awakened Inversion Sigil that crafts Stable Inverted Ingots which never implode. Unfortunately, it is not easy to create. Using the Awakened Sigil on a beacon provides some hints, or read on for precise instructions. uie.nei.infopage.pseudo_reversion_sigil.2=To set up the new ritual, place a beacon in The End with spirals of redstone and string leading away from it. Place four chests in the cardinal directions and fill them with specific items. uie.nei.infopage.pseudo_reversion_sigil.3=Finally, activate the ritual by sacrificing an Iron Golem inside of the spiral. This begins an otherworldly siege... survive while defeating enemies to complete the ritual. Dying or leaving the dimension cancels it. -uie.nei.infopage.architects_wand.1=This wand is designed to aid the bearer in construction by placing many blocks at the same time. While looking at a block, a wireframe indicates where the wand will place blocks. Holding Sprint or Sneak locks the orientation of the wand. -uie.nei.infopage.architects_wand.2=When holding a building block in your off-hand, the wand tries to place it instead. -uie.nei.infopage.architects_wand.3=If, instead of holding a block, you hold a trowel, random blocks from your hotbar are placed. -uie.nei.infopage.gourmands_axe.1=This axe contains potent restorative magic that restores the bearer's hunger while it is held. Attacking with the axe heals whatever is hit at the cost of hunger - but this healing is deadly to the undead. -uie.nei.infopage.destruction_pickaxe.1=This pickaxe is imbued with a destructive rune that allows it to mine stone 5x faster than a diamond pickaxe. However, it is extremely slow at mining anything else and blocks mined are destroyed instead of dropping. +uie.nei.infopage.builders_wand.1=This wand is designed to aid the bearer in construction by placing many blocks at the same time. While looking at a block, a wireframe indicates where the wand will place blocks. Holding Sprint or Sneak locks the orientation of the wand. +uie.nei.infopage.builders_wand.2=When holding a building block in your off-hand, the wand tries to place it instead. +uie.nei.infopage.builders_wand.3=If, instead of holding a block, you hold a trowel, random blocks from your hotbar are placed. +uie.nei.infopage.sating_axe.1=This axe contains potent restorative magic that restores the bearer's hunger while it is held. Attacking with the axe heals whatever is hit at the cost of hunger - but this healing is deadly to the undead. +uie.nei.infopage.erasure_pickaxe.1=This pickaxe is imbued with a destructive rune that allows it to mine stone 5x faster than a diamond pickaxe. However, it is extremely slow at mining anything else and blocks mined are destroyed instead of dropping. uie.nei.infopage.anti_gravity_shovel.1=This shovel deals with the annoyance of falling blocks by destroying all sand or gravel in a column above the block mined. Blocks mined with this are destroyed instead of dropping. -uie.nei.infopage.precision_shears.1=These shears can break any block at a stone harvest level and mining speed. Shift-using the shears breaks a block instantly. Any blocks broken are instantly teleported to your inventory. -uie.nei.infopage.etheric_sword.1=This sword is partially ethereal and deals an additional 3 hearts of damage as magical armor-piercing damage. -uie.nei.infopage.reversing_hoe.1=This hoe is steeped in inversion magic and can reverse crop growth on use. It also converts dirt into grass and cobblestone into stone. +uie.nei.infopage.recall_shears.1=These shears can break any block at a stone harvest level and mining speed. Sneak-using the shears breaks a block instantly. Any blocks broken are instantly teleported to your inventory. +uie.nei.infopage.liminal_sword.1=This sword is partially ethereal and deals an additional 3 hearts of magical armor-piercing damage. +uie.nei.infopage.retrograde_hoe.1=This hoe is steeped in inversion magic and can reverse crop growth on use. It also converts dirt into grass and cobblestone into stone. uie.nei.infopage.mob_jar.1=A deceptively small jar that can hold the soul of any passive creature. Use to capture a mob and again to release. uie.nei.infopage.redstone_clock.1=A precisely calibrated redstone mechanism which emits a pulse once every second. Turns off when redstone powered. uie.nei.infopage.smart_pump.1=The Smart Pump is a lag-light way to gather in-world fluids. Placed directly above the a fluid block and fed RF, it begins collecting fluid and replacing it with stone without triggering block updates. @@ -94,7 +94,7 @@ uie.nei.infopage.trash_can_energy.1=A painless way to dispose of unwanted RF! Wh uie.nei.infopage.magic_wood.1=The enchantments woven into this block give it the enchanting power of five bookshelves! uie.nei.infopage.endspark.1=Combining enchanted wood with the power of The End makes it even stronger, boosting enchanting tables by 20 levels! uie.nei.infopage.cursed_earth.1=Cursed Earth is created by the Inversion Sigil's Awakening Ritual. It rapidly spawns monsters, spreads in darkness, and burns away in bright light. Monster Spawners are supercharged when Cursed Earth is below them, and they continue to operate even when a player is not nearby. -uie.nei.infopage.blessed_earth.1=Blessed Earth is created by inverting Cursed Earth with a Reversing Hoe. It rapidly spawns passive mobs and spreads similarly to Cursed Earth. +uie.nei.infopage.blessed_earth.1=Blessed Earth is created by inverting Cursed Earth with a Retrograde Hoe. It rapidly spawns passive mobs and spreads similarly to Cursed Earth. uie.nei.infopage.pure_love.1=This infectiously positive block inspires nearby animals to fall in love. Cute! uie.nei.infopage.marginally_maximised_chest.1=This chest is ever-so-slightly larger than normal (not large enough to store any more items than usual). It does not form double chests and can be opened even if there is a block above it. uie.nei.infopage.significantly_shrunk_chest.1=This tiny chest holds only a single stack of items. It's not very space-efficient, but look at how adorable it is! @@ -454,13 +454,13 @@ item.inversion_sigil_inactive.name=Inert Inversion Sigil item.inversion_sigil_active.name=Awakened Inversion Sigil item.pseudo_reversion_sigil.name=Pseudo-Reversion Sigil -item.architects_wand.name=Architect's Wand -item.gourmands_axe.name=Gourmand's Axe -item.destruction_pickaxe.name=Destruction Pickaxe +item.builders_wand.name=Builder's Wand +item.sating_axe.name=Sating Axe +item.erasure_pickaxe.name=Erasure Pickaxe item.anti_gravity_shovel.name=Anti-Gravity Shovel -item.precision_shears.name=Precision Shears -item.etheric_sword.name=Etheric Sword -item.reversing_hoe.name=Reversing Hoe +item.recall_shears.name=Recall Shears +item.liminal_sword.name=Liminal Sword +item.retrograde_hoe.name=Retrograde Hoe item.mob_jar.name=Mob Jar @@ -568,7 +568,7 @@ uie.desc.item.capacity_upgrade.2=Max Upgrades: %s uie.desc.item.unbreakable=Unbreakable -uie.desc.item.architects_wand.1=Can place up to %s blocks at once +uie.desc.item.builders_wand.1=Can place up to %s blocks at once uie.desc.item.paint_roller.0=[§a%s§7] Colorable blocks to dye them uie.desc.item.paint_roller.1=[§a%s§7] The air to select hex color @@ -581,7 +581,7 @@ item.heavenly_ring_metal.aliases=Angel Ring item.heavenly_ring_fairy.aliases=Angel Ring item.heavenly_ring_dragon.aliases=Angel Ring item.heavenly_ring_feather.aliases=Angel Ring -item.architects_wand.aliases=Builder's Wand +item.builders_wand.aliases=Builder's Wand item.pseudo_reversion_sigil.aliases=Division Sigil item.inversion_sigil_active.aliases=Division Sigil item.inversion_sigil_inactive.aliases=Division Sigil @@ -828,8 +828,8 @@ uie.config.items.watering_can_tier=Watering Can Tiers #uie.config.items.watering_can_tier.tooltip= uie.config.items.watering_can_flowering=Watering Can Flowering #uie.config.items.watering_can_flowering.tooltip= -uie.config.items.architects_wands=Architect's Wands -#uie.config.items.architects_wands.tooltip= +uie.config.items.builders_wands=Builder's Wands +#uie.config.items.builders_wands.tooltip= uie.config.other=Other #uie.config.other.tooltip= uie.config.recipes=Recipes diff --git a/src/main/resources/assets/utilitiesinexcess/lang/es_AR.lang b/src/main/resources/assets/utilitiesinexcess/lang/es_AR.lang index 6727b3f17..07661cf81 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/es_AR.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/es_AR.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Aureola de Ángel item.heavenly_ring_fairy.aliases=Aureola de Ángel item.heavenly_ring_dragon.aliases=Aureola de Ángel item.heavenly_ring_feather.aliases=Aureola de Ángel -item.architects_wand.aliases=Varita de Constructor item.pseudo_reversion_sigil.aliases=Runa de División item.inversion_sigil_active.aliases=Runa de División item.inversion_sigil_inactive.aliases=Runa de División diff --git a/src/main/resources/assets/utilitiesinexcess/lang/es_ES.lang b/src/main/resources/assets/utilitiesinexcess/lang/es_ES.lang index 6727b3f17..07661cf81 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/es_ES.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/es_ES.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Aureola de Ángel item.heavenly_ring_fairy.aliases=Aureola de Ángel item.heavenly_ring_dragon.aliases=Aureola de Ángel item.heavenly_ring_feather.aliases=Aureola de Ángel -item.architects_wand.aliases=Varita de Constructor item.pseudo_reversion_sigil.aliases=Runa de División item.inversion_sigil_active.aliases=Runa de División item.inversion_sigil_inactive.aliases=Runa de División diff --git a/src/main/resources/assets/utilitiesinexcess/lang/es_MX.lang b/src/main/resources/assets/utilitiesinexcess/lang/es_MX.lang index 6727b3f17..07661cf81 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/es_MX.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/es_MX.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Aureola de Ángel item.heavenly_ring_fairy.aliases=Aureola de Ángel item.heavenly_ring_dragon.aliases=Aureola de Ángel item.heavenly_ring_feather.aliases=Aureola de Ángel -item.architects_wand.aliases=Varita de Constructor item.pseudo_reversion_sigil.aliases=Runa de División item.inversion_sigil_active.aliases=Runa de División item.inversion_sigil_inactive.aliases=Runa de División diff --git a/src/main/resources/assets/utilitiesinexcess/lang/es_UY.lang b/src/main/resources/assets/utilitiesinexcess/lang/es_UY.lang index 6727b3f17..07661cf81 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/es_UY.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/es_UY.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Aureola de Ángel item.heavenly_ring_fairy.aliases=Aureola de Ángel item.heavenly_ring_dragon.aliases=Aureola de Ángel item.heavenly_ring_feather.aliases=Aureola de Ángel -item.architects_wand.aliases=Varita de Constructor item.pseudo_reversion_sigil.aliases=Runa de División item.inversion_sigil_active.aliases=Runa de División item.inversion_sigil_inactive.aliases=Runa de División diff --git a/src/main/resources/assets/utilitiesinexcess/lang/es_VE.lang b/src/main/resources/assets/utilitiesinexcess/lang/es_VE.lang index 6727b3f17..07661cf81 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/es_VE.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/es_VE.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Aureola de Ángel item.heavenly_ring_fairy.aliases=Aureola de Ángel item.heavenly_ring_dragon.aliases=Aureola de Ángel item.heavenly_ring_feather.aliases=Aureola de Ángel -item.architects_wand.aliases=Varita de Constructor item.pseudo_reversion_sigil.aliases=Runa de División item.inversion_sigil_active.aliases=Runa de División item.inversion_sigil_inactive.aliases=Runa de División diff --git a/src/main/resources/assets/utilitiesinexcess/lang/fr_CA.lang b/src/main/resources/assets/utilitiesinexcess/lang/fr_CA.lang index d7b7171ac..30751b385 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/fr_CA.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/fr_CA.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Anneau angélique item.heavenly_ring_fairy.aliases=Anneau angélique item.heavenly_ring_dragon.aliases=Anneau angélique item.heavenly_ring_feather.aliases=Anneau angélique -item.architects_wand.aliases=Baguette de constructeur item.pseudo_reversion_sigil.aliases=Symbole de division item.inversion_sigil_active.aliases=Symbole de division item.inversion_sigil_inactive.aliases=Symbole de division diff --git a/src/main/resources/assets/utilitiesinexcess/lang/fr_FR.lang b/src/main/resources/assets/utilitiesinexcess/lang/fr_FR.lang index d4b65e83b..28f3baa67 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/fr_FR.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/fr_FR.lang @@ -3,8 +3,7 @@ item.heavenly_ring_magic.aliases=Anneau d'Ange item.heavenly_ring_metal.aliases=Anneau d'Ange item.heavenly_ring_fairy.aliases=Anneau d'Ange item.heavenly_ring_dragon.aliases=Anneau d'Ange -item.heavenly_ring_feather.aliases=Anneau d'Ange -item.architects_wand.aliases=Baquette du constructeur +item.heavenly_ring_feather.aliases=Anneau d'Ange item.pseudo_reversion_sigil.aliases=Symbole de division item.inversion_sigil_active.aliases=Symbole de division item.inversion_sigil_inactive.aliases=Symbole de division diff --git a/src/main/resources/assets/utilitiesinexcess/lang/ko_KR.lang b/src/main/resources/assets/utilitiesinexcess/lang/ko_KR.lang index ee19e64d7..29de07048 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/ko_KR.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/ko_KR.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=천사의 고리 item.heavenly_ring_fairy.aliases=천사의 고리 item.heavenly_ring_dragon.aliases=천사의 고리 item.heavenly_ring_feather.aliases=천사의 고리 -item.architects_wand.aliases=건축가의 완드 item.pseudo_reversion_sigil.aliases=분할의 인장 item.inversion_sigil_active.aliases=분할의 인장 item.inversion_sigil_inactive.aliases=분할의 인장 diff --git a/src/main/resources/assets/utilitiesinexcess/lang/pl_PL.lang b/src/main/resources/assets/utilitiesinexcess/lang/pl_PL.lang index dca96acb1..2dc354dbb 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/pl_PL.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/pl_PL.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Anielski pierścień item.heavenly_ring_fairy.aliases=Anielski pierścień item.heavenly_ring_dragon.aliases=Anielski pierścień item.heavenly_ring_feather.aliases=Anielski pierścień -item.architects_wand.aliases=Różczka budowniczego item.pseudo_reversion_sigil.aliases=Pieczęć dielenia item.inversion_sigil_active.aliases=Pieczęć dielenia item.inversion_sigil_inactive.aliases=Pieczęć dielenia diff --git a/src/main/resources/assets/utilitiesinexcess/lang/pt_BR.lang b/src/main/resources/assets/utilitiesinexcess/lang/pt_BR.lang index ccd188b5d..2d69c3c21 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/pt_BR.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/pt_BR.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Anel de Anjo item.heavenly_ring_fairy.aliases=Anel de Anjo item.heavenly_ring_dragon.aliases=Anel de Anjo item.heavenly_ring_feather.aliases=Anel de Anjo -item.architects_wand.aliases=Varinha do Construtor item.pseudo_reversion_sigil.aliases=Runa de Divisão item.inversion_sigil_active.aliases=Runa de Divisão item.inversion_sigil_inactive.aliases=Runa de Divisão diff --git a/src/main/resources/assets/utilitiesinexcess/lang/ru_RU.lang b/src/main/resources/assets/utilitiesinexcess/lang/ru_RU.lang index df054b4a8..c3c4765e1 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/ru_RU.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/ru_RU.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=Ангельское кольцо item.heavenly_ring_fairy.aliases=Ангельское кольцо item.heavenly_ring_dragon.aliases=Ангельское кольцо item.heavenly_ring_feather.aliases=Ангельское кольцо -item.architects_wand.aliases=Жезл строителя item.pseudo_reversion_sigil.aliases=Сигил деления item.inversion_sigil_active.aliases=Сигил деления item.inversion_sigil_inactive.aliases=Сигил деления diff --git a/src/main/resources/assets/utilitiesinexcess/lang/zh_CN.lang b/src/main/resources/assets/utilitiesinexcess/lang/zh_CN.lang index 44b9398f6..a8e36da41 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/zh_CN.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/zh_CN.lang @@ -4,7 +4,6 @@ item.heavenly_ring_metal.aliases=天使指环 item.heavenly_ring_fairy.aliases=天使指环 item.heavenly_ring_dragon.aliases=天使指环 item.heavenly_ring_feather.aliases=天使指环 -item.architects_wand.aliases=建筑之杖 item.pseudo_reversion_sigil.aliases=分割徽章 item.inversion_sigil_active.aliases=分割徽章 item.inversion_sigil_inactive.aliases=分割徽章 diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/architects_wand.png b/src/main/resources/assets/utilitiesinexcess/textures/items/builders_wand.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/architects_wand.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/builders_wand.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/destruction_pickaxe.png b/src/main/resources/assets/utilitiesinexcess/textures/items/erasure_pickaxe.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/destruction_pickaxe.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/erasure_pickaxe.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/etheric_sword.png b/src/main/resources/assets/utilitiesinexcess/textures/items/liminal_sword.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/etheric_sword.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/liminal_sword.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears.png b/src/main/resources/assets/utilitiesinexcess/textures/items/recall_shears.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/recall_shears.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears_cooldown.png b/src/main/resources/assets/utilitiesinexcess/textures/items/recall_shears_cooldown.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears_cooldown.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/recall_shears_cooldown.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/reversing_hoe.png b/src/main/resources/assets/utilitiesinexcess/textures/items/retrograde_hoe.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/reversing_hoe.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/retrograde_hoe.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/gourmands_axe.png b/src/main/resources/assets/utilitiesinexcess/textures/items/sating_axe.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/gourmands_axe.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/sating_axe.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/super_architects_wand.png b/src/main/resources/assets/utilitiesinexcess/textures/items/super_builders_wand.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/super_architects_wand.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/super_builders_wand.png