The great renaming in hodgepodge (#417)

* try rename

* spotless

dependencies.gradle

@@ -21,7 +21,7 @@ dependencies {
  transformedModCompileOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev")
  // Transitive updates to make runClient17 work
  transformedModCompileOnly("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev")
- transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev")
+ transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev")
  transformedModCompileOnly("com.github.GTNewHorizons:harvestcraft:1.2.1-GTNH:dev")
  transformedModCompileOnly("com.github.GTNewHorizons:HungerOverhaul:1.1.0-GTNH:dev")
  transformedModCompileOnly("com.github.GTNewHorizons:MrTJPCore:1.2.1:dev") // Do not update, fixed afterwards

src/main/java/com/mitchej123/hodgepodge/client/PollutionTooltip.java

@@ -10,8 +10,8 @@
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
 public class PollutionTooltip {
 
@@ -27,25 +27,25 @@ public void getTooltip(ItemTooltipEvent event) {
  String furnacePollution = String.format(producesPollutionFormat, PollutionConfig.furnacePollutionAmount);
 
  // Furnace and Iron Furnace
- if (GT_Utility.areStacksEqual(event.itemStack, new ItemStack(Blocks.furnace)) || GT_Utility
- .areStacksEqual(event.itemStack, GT_ModHandler.getModItem("IC2", "blockMachine", 1, 1))) {
+ if (GTUtility.areStacksEqual(event.itemStack, new ItemStack(Blocks.furnace)) || GTUtility
+ .areStacksEqual(event.itemStack, GTModHandler.getModItem("IC2", "blockMachine", 1, 1))) {
  event.toolTip.add(furnacePollution);
  }
 
  // Alchemical Furnace
  if (Compat.isThaumcraftPresent()) {
- if (GT_Utility.areStacksEqual(
+ if (GTUtility.areStacksEqual(
  event.itemStack,
- GT_ModHandler.getModItem("Thaumcraft", "blockStoneDevice", 1, 0))) {
+ GTModHandler.getModItem("Thaumcraft", "blockStoneDevice", 1, 0))) {
  event.toolTip.add(furnacePollution);
  }
  }
 
  // Advanced Alchemical Furnace
  if (Compat.isThaumicBasesPresent()) {
- if (GT_Utility.areStacksEqual(
+ if (GTUtility.areStacksEqual(
  event.itemStack,
- GT_ModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0))) {
+ GTModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0))) {
  event.toolTip.add(furnacePollution);
  }
  }
@@ -55,37 +55,36 @@ public void getTooltip(ItemTooltipEvent event) {
  String multiProducesPollutionFormat = "A complete Multiblock produces %d Pollution/Second";
 
  // Solid and Liquid Boiler Firebox
- if (GT_Utility.areStacksEqual(event.itemStack, GT_ModHandler.getModItem("Railcraft", "machine.beta", 1, 5))
- || GT_Utility.areStacksEqual(
+ if (GTUtility.areStacksEqual(event.itemStack, GTModHandler.getModItem("Railcraft", "machine.beta", 1, 5))
+ || GTUtility.areStacksEqual(
  event.itemStack,
- GT_ModHandler.getModItem("Railcraft", "machine.beta", 1, 6))) {
+ GTModHandler.getModItem("Railcraft", "machine.beta", 1, 6))) {
  event.toolTip.add(
  String.format(
  "Produces %d Pollution/Second per firebox",
  PollutionConfig.fireboxPollutionAmount));
  }
 
  // Tunnel Bore
- if (GT_Utility.areStacksEqual(event.itemStack, GT_ModHandler.getModItem("Railcraft", "cart.bore", 1, 0))) {
+ if (GTUtility.areStacksEqual(event.itemStack, GTModHandler.getModItem("Railcraft", "cart.bore", 1, 0))) {
  event.toolTip.add(String.format(producesPollutionFormat, PollutionConfig.tunnelBorePollutionAmount));
  }
 
  // Coke Oven Brick
- if (GT_Utility
- .areStacksEqual(event.itemStack, GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1, 7))) {
+ if (GTUtility
+ .areStacksEqual(event.itemStack, GTModHandler.getModItem("Railcraft", "machine.alpha", 1, 7))) {
  event.toolTip.add(String.format(multiProducesPollutionFormat, PollutionConfig.cokeOvenPollutionAmount));
  }
 
  // Advanced Coke Oven Brick
- if (GT_Utility
- .areStacksEqual(event.itemStack, GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1, 12))) {
+ if (GTUtility
+ .areStacksEqual(event.itemStack, GTModHandler.getModItem("Railcraft", "machine.alpha", 1, 12))) {
  event.toolTip.add(
  String.format(multiProducesPollutionFormat, PollutionConfig.advancedCokeOvenPollutionAmount));
  }
 
  // Hobbyist's Steam Engine
- if (GT_Utility
- .areStacksEqual(event.itemStack, GT_ModHandler.getModItem("Railcraft", "machine.beta", 1, 7))) {
+ if (GTUtility.areStacksEqual(event.itemStack, GTModHandler.getModItem("Railcraft", "machine.beta", 1, 7))) {
  event.toolTip
  .add(String.format(producesPollutionFormat, PollutionConfig.hobbyistEnginePollutionAmount));
  }

src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2Hazmat.java

@@ -5,7 +5,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.core.item.armor.ItemArmorHazmat;
 
 @Mixin(value = ItemArmorHazmat.class, remap = false)
@@ -17,6 +17,6 @@ public class MixinIc2Hazmat {
  */
  @Overwrite
  public static boolean hasCompleteHazmat(EntityLivingBase entity) {
- return GT_Utility.isWearingFullRadioHazmat(entity);
+ return GTUtility.isWearingFullRadioHazmat(entity);
  }
 }

src/main/java/com/mitchej123/hodgepodge/util/ColorOverrideType.java

@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 
-import gregtech.common.render.GT_PollutionRenderer;
+import gregtech.common.render.PollutionRenderer;
 
 public enum ColorOverrideType {
 
@@ -26,13 +26,13 @@ public static ColorOverrideType fromName(String name) {
  public int getColor(int oColor, int x, int z) {
  switch (this) {
  case FLOWER:
- return GT_PollutionRenderer.colorFoliage(oColor, x, z);
+ return PollutionRenderer.colorFoliage(oColor, x, z);
  case GRASS:
- return GT_PollutionRenderer.colorGrass(oColor, x, z);
+ return PollutionRenderer.colorGrass(oColor, x, z);
  case LEAVES:
- return GT_PollutionRenderer.colorLeaves(oColor, x, z);
+ return PollutionRenderer.colorLeaves(oColor, x, z);
  case LIQUID:
- return GT_PollutionRenderer.colorLiquid(oColor, x, z);
+ return PollutionRenderer.colorLiquid(oColor, x, z);
  }
  throw new RuntimeException();
  }

src/main/java/com/mitchej123/hodgepodge/util/PollutionHelper.java

@@ -5,7 +5,7 @@
 import com.mitchej123.hodgepodge.Compat;
 import com.mitchej123.hodgepodge.config.PollutionConfig;
 
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
 public class PollutionHelper {
 
@@ -14,7 +14,7 @@ public class PollutionHelper {
  */
  public static void addPollution(Chunk ch, int aPollution) {
  if (Compat.isGT5Present()) {
- GT_Pollution.addPollution(ch, aPollution);
+ Pollution.addPollution(ch, aPollution);
  }
  }