diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-05 17:02:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-05 17:02:07 +0100 |
commit | de7195ffc2879a2212979c73a4e570633ee93f8e (patch) | |
tree | 9593a312423fa59d3b83a3b09a22833b4785db5d /src/main/java | |
parent | 3c78346bcf531d9e99032923798d4866dde6cb41 (diff) | |
parent | 3f0224f55faab43cdebc19015d3132e30b9a766c (diff) | |
download | GT5-Unofficial-de7195ffc2879a2212979c73a4e570633ee93f8e.tar.gz GT5-Unofficial-de7195ffc2879a2212979c73a4e570633ee93f8e.tar.bz2 GT5-Unofficial-de7195ffc2879a2212979c73a4e570633ee93f8e.zip |
Merge pull request #1226 from Antifluxfield/patch-1
Fix AssLine structure check
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 8 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index c0e1134c6a..09fb87fd25 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1888,5 +1888,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } + @SubscribeEvent + public void onBlockEvent(BlockEvent event) { + if (event.block.getUnlocalizedName().equals("blockAlloyGlass")) + GregTech_API.causeMachineUpdate(event.world, event.x, event.y, event.z); + } + -}
\ No newline at end of file +} diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 99f2eaf93a..719907d285 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -722,5 +722,6 @@ public class GT_Loader_Item_Block_And_Fluid FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData(Materials.NaquadahEnriched.getMolten(1000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)));
FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData(Materials.Naquadria.getMolten(1000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadria, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)));
+ GregTech_API.registerMachineBlock(GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0);
}
}
|