diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-02-09 07:17:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 08:17:17 +0100 |
| commit | b4b5e9077704a4e7d8619e7cd0d527af0c828a72 (patch) | |
| tree | 57dd39418ea4bf4872290047d1f50d59781ef240 /src/main/java/gtPlusPlus/core | |
| parent | 53d893935094140835494e3b983cbef6d0adc731 (diff) | |
| download | GT5-Unofficial-b4b5e9077704a4e7d8619e7cd0d527af0c828a72.tar.gz GT5-Unofficial-b4b5e9077704a4e7d8619e7cd0d527af0c828a72.tar.bz2 GT5-Unofficial-b4b5e9077704a4e7d8619e7cd0d527af0c828a72.zip | |
Fix immature alk code (#535)
* Remove immature code
* Remove even more immature code
* spotlessApply (#536)
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
11 files changed, 9 insertions, 89 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 19cf2d8356..6d1d7bbf08 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -120,15 +120,11 @@ public class CommonProxy { // Handles Magic Feather Utils.registerEvent(ModItems.itemMagicFeather); - if (CORE.DEVENV) { - Utils.registerEvent(new StopAnnoyingFuckingAchievements()); - } - Utils.registerEvent(new EnderDragonDeathHandler()); Utils.registerEvent(new EntityDeathHandler()); if (ConfigSwitches.disableZombieReinforcement) { - // Make Zombie reinforcements fuck off. + // Make Zombie reinforcements stop showing up. Utils.registerEvent(new ZombieBackupSpawnEventHandler()); } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 357647c83e..2a08956e2e 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -49,7 +49,7 @@ public class COMPAT_IC2 { if (ConfigSwitches.disableIC2Recipes) { - // Fuck these right off. + // Remove these. RemoveRecipeQueue.add("IC2:itemCable"); RemoveRecipeQueue.add("IC2:itemCable:1"); RemoveRecipeQueue.add("IC2:itemCable:2"); diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java index c5391468d6..0aed4d3d5a 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java @@ -422,9 +422,7 @@ public class EntityStaballoyConstruct extends EntityIronGolem { } @Override - public void knockBack(Entity p_70653_1_, float p_70653_2_, double p_70653_3_, double p_70653_5_) { - // Do Nothing because he weighs metric shittonnes. - } + public void knockBack(Entity p_70653_1_, float p_70653_2_, double p_70653_3_, double p_70653_5_) {} @Override protected void setOnFireFromLava() { diff --git a/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java deleted file mode 100644 index ed2f29f45e..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.handler; - -import java.lang.reflect.Field; - -import net.minecraft.stats.AchievementList; -import net.minecraftforge.event.entity.player.AchievementEvent; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class StopAnnoyingFuckingAchievements { - - /** - * Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client. - * - * @param event - */ - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void FUCK_OFF(AchievementEvent event) { - if (Utils.isClient()) { - doClientStuff(); - } - if (event.achievement.equals(AchievementList.openInventory)) { - event.setCanceled(true); - } - } - - @SideOnly(Side.CLIENT) - private final void doClientStuff() { - Class aMC = ReflectionUtils.getClass("net.minecraft.client.Minecraft"); - if (aMC != null) { - Field aInstanceMC = ReflectionUtils.getField(aMC, "theMinecraft"); - Object aMcObj = ReflectionUtils.getFieldValue(null, aInstanceMC); - Class aClazz2 = aMcObj.getClass(); - if (aClazz2 != null) { - Field aGameSettings = ReflectionUtils.getField(aClazz2, "gameSettings"); - Object aGameSettingsObj = ReflectionUtils.getFieldValue(aInstanceMC, aGameSettings); - Class aClazz3 = aGameSettingsObj.getClass(); - if (aClazz3 != null) { - Field ainvHint = ReflectionUtils.getField(aClazz3, "showInventoryAchievementHint"); - ReflectionUtils.setField(aGameSettingsObj, ainvHint, false); - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java index cbbb1df2ee..86736fe14b 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java @@ -15,8 +15,7 @@ public class ZombieBackupSpawnEventHandler { /** * - * Do we really need this pathetic mechanic to exist when it doesn't work properly at all? Or , well, maybe you - * enjoy Zombies spawning IN YOUR FUCKING FACE?! + * Do we really need this pathetic mechanic to exist when it doesn't work properly at all? * */ @SubscribeEvent(priority = EventPriority.HIGHEST) diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 470ed64347..3901b30c35 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -1208,7 +1208,7 @@ public final class ModItems { MaterialEIO.CONDUCTIVE_IRON.getRgbAsHex(), 0); - // Register dumb naming conventions - Who chose fucking phased Iron/Gold? + // Register odd naming conventions. GT_OreDictUnificator.registerOre("dustPhasedGold", ItemUtils.getSimpleStack(itemDustVibrantAlloy)); GT_OreDictUnificator.registerOre("platePhasedGold", ItemUtils.getSimpleStack(itemPlateVibrantAlloy)); GT_OreDictUnificator.registerOre("dustPhasedIron", ItemUtils.getSimpleStack(itemDustPulsatingIron)); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java index 630cbeff95..ec4d9de11c 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -386,7 +386,7 @@ public class ModularBauble extends BaseBauble { this.SetBaubleType(BT.TYPE_RING); } if (PlayerUtils.isPlayerOP((EntityPlayer) arg1)) { - return true; // Let OPs wear other peoples shit. + return true; // Let OPs wear other peoples stuff. } String mOwner; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index a2c02b51c2..4786e67989 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -868,7 +868,7 @@ public class RECIPES_Machines { private static void algaeFarm() { - // Give the shitty algae a use :) + // Give the bad algae a use. CORE.RA.addDistilleryRecipe( ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 32), null, diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 55dff5cbf7..bb7704e530 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -665,7 +665,7 @@ public class CI { m = aMaster[2][aTier]; aReturn = ItemUtils.getOrePrefixStack(aPrefix, m, aAmount); - // All Invalid? Ok, shit. + // All Invalid? // Let's add a special error ingot. if (!ItemUtils.checkForInvalidItems(aReturn)) { aReturn = ItemUtils diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java index 6e27dbafef..62b1e365aa 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java @@ -327,7 +327,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT } /* - * Alk's Simplified Redstone Handling functions (Fuck redstone) + * GT++ Simplified Redstone Handling functions. */ /** diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java index b4e6a8fceb..9a1292dea0 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java @@ -203,29 +203,6 @@ public class HazmatUtils { } if (LoadedMods.isModLoaded("ThaumicTinkerer")) { - /* - * AutoMap<Item> aItems = new AutoMap<Item>(); Class aMainTT = - * ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer"); Class aItemRegistryTT = - * ReflectionUtils.getClass("thaumic.tinkerer.common.registry.TTRegistry"); Field aRegistryInstance = - * ReflectionUtils.getField(aMainTT, "registry"); Object aRegistry = - * ReflectionUtils.getFieldValue(aRegistryInstance); Method aFuckingStupidMethodHandlingMethod = - * ReflectionUtils.getMethod(aItemRegistryTT, "getFirstItemFromClass", new Class[] {Class.class}); Item - * aIchorHelm = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new - * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemHelm")}); Item - * aIchorChest = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new - * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemChest")}); Item - * aIchorLegs = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new - * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemLegs")}); Item - * aIchorBoots = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new - * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemBoots")}); - * aItems.add(aIchorHelm); aItems.add(aIchorChest); aItems.add(aIchorLegs); aItems.add(aIchorBoots); - * AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>(); int aIndex = 0; for (Item aItem : aItems) { Item - * aItemObject = null; if (aItem != null) { aItemMap.add(ItemUtils.getSimpleStack(aItemObject)); } else { - * Logger.INFO("[Hazmat] Could not get item "+aIndex+" from "+aItemRegistryTT.getName()); } aIndex++; } - * Logger.INFO("[Hazmat] Registering "+aItemMap.size()+" Thaumic Tinkerer Items as hazmat gear."); for - * (ItemStack aItem : aItemMap) { addProtection(aItem); } - * Logger.INFO("[Hazmat] Registered Thaumic Tinkerer Items as hazmat gear."); - */ Logger.INFO("[Hazmat] Did not register Thaumic Tinkerer Items as hazmat gear."); } |
