aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2019-07-16 09:56:45 +0200
committerGitHub <noreply@github.com>2019-07-16 09:56:45 +0200
commit751aa918768533e6267d7467abb5dc247299d3c5 (patch)
tree609e8a0e4e73288b0fa96d53ef82ca0ec951dcc5 /src/main/java/gregtech/common
parent30715b1438568a7594cbd7ef03e70f93adc76bdf (diff)
parentec3fba6409b5ccfdc90494c95fffc7cafd95a3f3 (diff)
downloadGT5-Unofficial-751aa918768533e6267d7467abb5dc247299d3c5.tar.gz
GT5-Unofficial-751aa918768533e6267d7467abb5dc247299d3c5.tar.bz2
GT5-Unofficial-751aa918768533e6267d7467abb5dc247299d3c5.zip
Merge pull request #195 from GTNewHorizons/ic2_enet_compat
IC2 ENet compat for GT transformers & GT cables
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 855367f5ff..6d50c6964a 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -29,7 +29,6 @@ import gregtech.common.gui.GT_GUIContainerVolumetricFlask;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
import gregtech.common.items.armor.ModularArmor_Item;
import gregtech.common.items.armor.gui.*;
-import ic2.api.reactor.IReactor;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -216,7 +215,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean gt6Cable = true;
public boolean ic2EnergySourceCompat = true;
public boolean costlyCableConnection = false;
- public final HashSet<IReactor> reactorsDone=new HashSet<>();
public GT_Proxy() {
GameRegistry.registerFuelHandler(this);
@@ -1234,7 +1232,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
@SubscribeEvent
public void onServerTickEvent(TickEvent.ServerTickEvent aEvent) {
- reactorsDone.clear();
}
@SubscribeEvent