Compile + Spotless

Author: ALongStringOfNumbers

src/main/java/gregtech/api/util/input/KeyBind.java

@@ -1,6 +1,5 @@
 package gregtech.api.util.input;
 
-import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
 import gregtech.api.util.GTLog;
 import gregtech.core.network.packets.PacketKeyPressed;

src/main/java/gregtech/asm/hooks/ArmorHooks.java

@@ -8,7 +8,6 @@
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.util.CapesRegistry;
-import gregtech.api.util.GTUtility;
 import gregtech.api.util.Mods;
 import gregtech.api.util.virtualregistry.VirtualEnderRegistry;
 import gregtech.api.worldgen.bedrockFluids.BedrockFluidVeinSaveData;
@@ -17,8 +16,6 @@
 import gregtech.common.items.behaviors.ToggleEnergyConsumerBehavior;
 import gregtech.common.metatileentities.multi.electric.centralmonitor.MetaTileEntityCentralMonitor;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;

src/main/java/gregtech/common/EventHandlers.java

@@ -1407,9 +1407,6 @@ private static void registerNBTRemoval() {
         ModHandler.addShapelessRecipe("fueled_jetpack_nbt", ArmorItems.FUELED_JETPACK.getStack(),
                 ArmorItems.FUELED_JETPACK.getStack());
 
-        ModHandler.addShapelessRecipe("fluid_jetpack_clear", SEMIFLUID_JETPACK.getStackForm(),
-                SEMIFLUID_JETPACK.getStackForm());
-
         // ClipBoard
         ModHandler.addShapelessNBTClearingRecipe("clipboard_nbt", CLIPBOARD.getStackForm(), CLIPBOARD.getStackForm());
     }

src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java

@@ -1,6 +1,6 @@
 package gregtech.mixins.minecraft;
 
-import gregtech.api.items.armor.IArmorItem;
+import gregtech.api.items.armoritem.IGTArmor;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBiped;
@@ -19,6 +19,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LayerArmorBase.class)
+@Deprecated
 public class LayerArmorBaseMixin {
 
     @Inject(method = "renderArmorLayer", at = @At("TAIL"))
@@ -27,7 +28,7 @@ public void renderGTArmor(EntityLivingBase entityLivingBaseIn, float limbSwing,
                               EntityEquipmentSlot slotIn, CallbackInfo ci) {
         ItemStack itemStack = entityLivingBaseIn.getItemStackFromSlot(slotIn);
 
-        if ((itemStack.getItem() instanceof IArmorItem armorItem &&
+        if ((itemStack.getItem() instanceof IGTArmor armorItem &&
                 itemStack.getItem().getEquipmentSlot(itemStack) == slotIn)) {
             @SuppressWarnings("unchecked")
             LayerArmorBase<ModelBase> layer = (LayerArmorBase<ModelBase>) (Object) this;
@@ -43,18 +44,21 @@ public void renderGTArmor(EntityLivingBase entityLivingBaseIn, float limbSwing,
             GlStateManager.enableBlend();
             GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
 
-            int layers = armorItem.getArmorLayersAmount(itemStack);
-            for (int layerIndex = 0; layerIndex < layers; layerIndex++) {
-                int i = armorItem.getArmorLayerColor(itemStack, layerIndex);
-                float f = (float) (i >> 16 & 255) / 255.0F;
-                float f1 = (float) (i >> 8 & 255) / 255.0F;
-                float f2 = (float) (i & 255) / 255.0F;
-                GlStateManager.color(f, f1, f2, 1.0f);
-                String type = layerIndex == 0 ? null : "layer_" + layerIndex;
-                layer.renderer.bindTexture(gregTechCEu$getArmorTexture(entityLivingBaseIn, itemStack, slotIn, type));
-                armorModel.render(entityLivingBaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch,
-                        scale);
-            }
+            // TODO, old implementation, still needed with new system?
+            /*
+             * int layers = armorItem.getArmorLayersAmount(itemStack);
+             * for (int layerIndex = 0; layerIndex < layers; layerIndex++) {
+             * int i = armorItem.getArmorLayerColor(itemStack, layerIndex);
+             * float f = (float) (i >> 16 & 255) / 255.0F;
+             * float f1 = (float) (i >> 8 & 255) / 255.0F;
+             * float f2 = (float) (i & 255) / 255.0F;
+             * GlStateManager.color(f, f1, f2, 1.0f);
+             * String type = layerIndex == 0 ? null : "layer_" + layerIndex;
+             * layer.renderer.bindTexture(gregTechCEu$getArmorTexture(entityLivingBaseIn, itemStack, slotIn, type));
+             * armorModel.render(entityLivingBaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch,
+             * scale);
+             * }
+             */
             if (itemStack.hasEffect()) {
                 LayerArmorBase.renderEnchantedGlint(layer.renderer, entityLivingBaseIn, armorModel, limbSwing,
                         limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale);

src/main/java/gregtech/mixins/forge/SpecialArmorPropertiesMixin.java

@@ -1,6 +1,6 @@
 package gregtech.mixins.minecraft;
 
-import gregtech.api.items.armor.IArmorItem;
+import gregtech.api.items.armoritem.IGTArmor;
 
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
@@ -16,6 +16,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(LayerCustomHead.class)
+@Deprecated
 public class LayerCustomHeadMixin {
 
     @WrapOperation(method = "doRenderLayer",
@@ -32,7 +33,7 @@ public void shouldNotRenderHead(ItemRenderer instance, EntityLivingBase entityli
     @Unique
     private static boolean gregTechCEu$shouldNotRenderHeadItem(EntityLivingBase entityLivingBase) {
         ItemStack itemStack = entityLivingBase.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
-        return (itemStack.getItem() instanceof IArmorItem &&
+        return (itemStack.getItem() instanceof IGTArmor &&
                 itemStack.getItem().getEquipmentSlot(itemStack) == EntityEquipmentSlot.HEAD);
     }
 }

src/main/java/gregtech/mixins/minecraft/LayerArmorBaseMixin.java

@@ -5,8 +5,7 @@
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
   "mixins" : [
-    "ModelLoaderRegistryMixin",
-    "SpecialArmorPropertiesMixin"
+    "ModelLoaderRegistryMixin"
   ],
   "client": [],
   "server": []