diff options
| author | repo-alt <wvk17@yandex.ru> | 2020-09-02 14:25:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 14:25:05 +0300 |
| commit | 9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8 (patch) | |
| tree | f77da81ba7c79487de876ed301bd767ca0225f7f /src/main/java/gregtech/loaders/oreprocessing | |
| parent | dac85f10d4c97cefc4099816c04fc95cdf1078d9 (diff) | |
| parent | 05420344ee5a3af1bab32a7e405ac5990da8a37a (diff) | |
| download | GT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.tar.gz GT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.tar.bz2 GT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.zip | |
Merge pull request #311 from repo-alt/experimental
Half baked EU P2P Tunnel removed, in favour of native implementation
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 7e54fdb279..63f4abcf65 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -18,7 +18,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr private Materials[] dielectrics = {Materials.PolyvinylChloride, Materials.Polydimethylsiloxane}; private Materials[] rubbers = {Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone}; private Materials[] syntheticRubbers = {Materials.StyreneButadieneRubber, Materials.Silicone}; - + static private TunnelType tt = TunnelType.ME; public ProcessingWire() { OrePrefixes.wireGt01.add(this); OrePrefixes.wireGt02.add(this); @@ -29,6 +29,16 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + if (GT_Mod.gregtechproxy.mAE2Integration) { + if (tt == TunnelType.ME) { + try { + tt = TunnelType.valueOf("GT_POWER"); + } catch (IllegalArgumentException ignored) { + tt = TunnelType.IC2_POWER; + } + } + } + int cableWidth; OrePrefixes correspondingCable; switch (aPrefix) { @@ -83,7 +93,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new Object[]{OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); if (GT_Mod.gregtechproxy.mAE2Integration) { - Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, TunnelType.IC2_POWER); + Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, tt); } break; default: @@ -173,8 +183,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } GT_Values.RA.addUnboxingRecipe(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), GT_Utility.copyAmount(1L, new Object[]{aStack}), null, 100, 8); if (GT_Mod.gregtechproxy.mAE2Integration) { - Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, TunnelType.IC2_POWER); - Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), TunnelType.IC2_POWER); + Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, tt); + Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), tt); } } } |