aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/proxy
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-10-18 17:03:23 +0100
committerGitHub <noreply@github.com>2023-10-18 18:03:23 +0200
commitfbdbb388c369fae549cfde3eed38b536f7461d90 (patch)
treeb46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/core/proxy
parentb670446fdf49991093b485f0aa14050039632775 (diff)
downloadGT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip
Cleaning up (#767)
* Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/proxy')
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java58
1 files changed, 1 insertions, 57 deletions
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index f1052d9332..b1bcbe39ed 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,14 +1,9 @@
package gtPlusPlus.core.proxy;
-import static gregtech.api.enums.Mods.PlayerAPI;
-
import java.util.ArrayList;
import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.entity.RenderFireball;
-import net.minecraft.client.renderer.entity.RenderSnowball;
-import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -22,7 +17,6 @@ import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -32,7 +26,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Mods;
import gtPlusPlus.GTplusplus;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
@@ -44,20 +37,14 @@ import gtPlusPlus.core.client.renderer.RenderSickBlaze;
import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct;
import gtPlusPlus.core.client.renderer.RenderToxinball;
import gtPlusPlus.core.common.CommonProxy;
-import gtPlusPlus.core.common.compat.COMPAT_PlayerAPI;
import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
import gtPlusPlus.core.entity.monster.EntitySickBlaze;
import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
import gtPlusPlus.core.entity.projectile.EntityLightningAttack;
-import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
-import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
-import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
-import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious;
import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer;
import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer;
import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
@@ -94,17 +81,10 @@ public class ClientProxy extends CommonProxy implements Runnable {
}
// Do this weird things for textures.
GTplusplus.loadTextures();
- // We boot up the sneak manager.
- if (PlayerAPI.isModLoaded()) {
- this.init_PlayerAPI_PRE();
- }
}
@Override
public void init(final FMLInitializationEvent e) {
- if (PlayerAPI.isModLoaded()) {
- this.init_PlayerAPI_INIT();
- }
/**
* Custom Block Renderers
@@ -137,14 +117,6 @@ public class ClientProxy extends CommonProxy implements Runnable {
RenderingRegistry
.registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct());
RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
- RenderingRegistry.registerEntityRenderingHandler(
- EntitySulfuricAcidPotion.class,
- new RenderSnowball(ModItems.itemSulfuricPotion));
- RenderingRegistry.registerEntityRenderingHandler(
- EntityHydrofluoricAcidPotion.class,
- new RenderSnowball(ModItems.itemHydrofluoricPotion));
- RenderingRegistry
- .registerEntityRenderingHandler(EntityThrowableBomb.class, new RenderSnowball(ModItems.itemBomb, 1));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F));
/**
@@ -168,36 +140,8 @@ public class ClientProxy extends CommonProxy implements Runnable {
}
@Override
- public void generateMysteriousParticles(final Entity theEntity) {
- final double motionX = theEntity.worldObj.rand.nextGaussian() * 0.02D;
- final double motionY = theEntity.worldObj.rand.nextGaussian() * 0.02D;
- final double motionZ = theEntity.worldObj.rand.nextGaussian() * 0.02D;
- final EntityFX particleMysterious = new EntityParticleFXMysterious(
- theEntity.worldObj,
- (theEntity.posX + (theEntity.worldObj.rand.nextFloat() * theEntity.width * 2.0F)) - theEntity.width,
- theEntity.posY + 0.5D + (theEntity.worldObj.rand.nextFloat() * theEntity.height),
- (theEntity.posZ + (theEntity.worldObj.rand.nextFloat() * theEntity.width * 2.0F)) - theEntity.width,
- motionX,
- motionY,
- motionZ);
- Minecraft.getMinecraft().effectRenderer.addEffect(particleMysterious);
- }
-
- @Override
public void serverStarting(final FMLServerStartingEvent e) {}
- @Optional.Method(modid = Mods.Names.PLAYER_API)
- private void init_PlayerAPI_PRE() {
- // Register player instance
- COMPAT_PlayerAPI.clientProxy.initPre();
- }
-
- @Optional.Method(modid = Mods.Names.PLAYER_API)
- private void init_PlayerAPI_INIT() {
- // Register player instance
- COMPAT_PlayerAPI.clientProxy.Init();
- }
-
public void onPreLoad() {
/*
* if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for
@@ -227,7 +171,7 @@ public class ClientProxy extends CommonProxy implements Runnable {
}
public void hideUniversalCells() {
- ArrayList<ItemStack> itemList = new ArrayList<ItemStack>();
+ ArrayList<ItemStack> itemList = new ArrayList<>();
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
if (fluid == null) {
continue;