aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2023-01-10 05:19:50 +0000
committerGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2023-01-10 05:19:50 +0000
commit5d8923f5ccc7581a7aa1e6ef3e11bd81fda336ed (patch)
treef6fab6f1462af0993c4129025f845030e7f925b4
parentd85ca0dedd5f0ecc91e0a8869796f1ac56ef75bf (diff)
downloadGT5-Unofficial-5d8923f5ccc7581a7aa1e6ef3e11bd81fda336ed.tar.gz
GT5-Unofficial-5d8923f5ccc7581a7aa1e6ef3e11bd81fda336ed.tar.bz2
GT5-Unofficial-5d8923f5ccc7581a7aa1e6ef3e11bd81fda336ed.zip
Fix attempt 2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java1
-rw-r--r--src/main/java/com/github/technus/tectech/loader/TecTechConfig.java3
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/ClientProxy.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java12
5 files changed, 10 insertions, 12 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java
index cf7096df0c..7394f1a668 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java
@@ -18,7 +18,6 @@ public class TT_turret_loader implements Runnable {
public void run() {
TurretHeadRenderEM turretHeadRenderEM = new TurretHeadRenderEM();
ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM);
- ClientRegistry.bindTileEntitySpecialRenderer(TileEyeOfHarmony.class, new RenderEyeOfHarmony());
MinecraftForgeClient.registerItemRenderer(
Item.getItemFromBlock(TurretHeadEM.INSTANCE),
new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM()));
diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
index 6f0197a3ba..3acc7320d6 100644
--- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
@@ -259,9 +259,6 @@ public class TecTechConfig extends ConfigManager {
"Set true to enable the cool visual effect when tesla tower running.");
}
- void specialRenderers() {
- }
-
/**
* This loading phases do not correspond to mod loading phases!
*/
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index da0c30cbf5..e5d75932a2 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -10,6 +10,7 @@ import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
import com.github.technus.tectech.thing.item.renderElemental.RenderElementalName;
import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX;
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.Loader;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -44,6 +45,9 @@ public class ClientProxy extends CommonProxy {
if (Loader.isModLoaded("openmodularturrets")) {
new TT_turret_loader().run();
}
+
+ ClientRegistry.bindTileEntitySpecialRenderer(TileEyeOfHarmony.class, new RenderEyeOfHarmony());
+
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java
index 9be2a139d1..68548cb53e 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java
@@ -4,8 +4,6 @@ import static com.github.technus.tectech.Reference.MODID;
import static java.lang.Math.*;
import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index 277bda316f..a4fae895c9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -39,7 +39,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
-import java.awt.*;
+
import java.util.*;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -55,7 +55,7 @@ import org.spongepowered.libraries.com.google.common.math.LongMath;
public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM
implements IConstructable, IGlobalWirelessEnergy {
- private static final boolean debugMode = false;
+ private static final boolean EOHDebugMode = true;
// Region variables.
private static Textures.BlockIcons.CustomIcon ScreenOFF;
@@ -1379,7 +1379,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
private double hydrogenOverflowProbabilityAdjustment;
private double heliumOverflowProbabilityAdjustment;
- private static final long ticksBetweenHatchDrain = debugMode ? 20 : 200;
+ private static final long ticksBetweenHatchDrain = EOHDebugMode ? 20 : 200;
private List<ItemStackLong> outputItems = new ArrayList<>();
@@ -1684,7 +1684,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
public boolean processRecipe(EyeOfHarmonyRecipe recipeObject) {
// Debug mode, overwrites the required fluids to initiate the recipe to 100L of each.
- if (debugMode) {
+ if (EOHDebugMode) {
if ((getHydrogenStored() < 100) || (getHeliumStored() < 100)) {
return false;
}
@@ -1711,7 +1711,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
calculateHydrogenHeliumInputExcessValues(
recipeObject.getHydrogenRequirement(), recipeObject.getHeliumRequirement());
- if (debugMode) {
+ if (EOHDebugMode) {
hydrogenOverflowProbabilityAdjustment = 0;
heliumOverflowProbabilityAdjustment = 0;
}
@@ -1726,7 +1726,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
validFluidMap.put(Materials.Helium.getGas(1), 0L);
double yield = recipeYieldCalculator();
- if (debugMode) {
+ if (EOHDebugMode) {
successChance = 1; // Debug recipes, sets them to 100% output chance.
}