From 51e269e3f59d6daefb03d121367900d28d38f504 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Sat, 16 Jul 2016 23:48:25 +0100 Subject: Initial This is more of a test and resource for when I eventually rewrite the GT5U ore texture/metadata system. --- .../java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/gregtech/loaders/preload') 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 4944281606..a7107909c0 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 @@ -135,6 +135,7 @@ public class GT_Loader_Item_Block_And_Fluid GregTech_API.sBlockCasings4 = new GT_Block_Casings4(); GregTech_API.sBlockGranites = new GT_Block_Granites(); GregTech_API.sBlockConcretes = new GT_Block_Concretes(); + GregTech_API.sBlockStones = new GT_Block_Stones(); GregTech_API.sBlockOres1 = new GT_Block_Ores(); GregTech_API.sBlockMetal1 = new GT_Block_Metal("gt.blockmetal1", new Materials[]{ Materials.Adamantium, -- cgit From de6e90a000b6a6c7c5f314cb8e4b311304cd775a Mon Sep 17 00:00:00 2001 From: Muramasa Date: Mon, 18 Jul 2016 19:00:53 +0100 Subject: Ore system rewrite --- .../java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/java/gregtech/loaders/preload') 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 a7107909c0..2b42c4cf14 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 @@ -137,6 +137,9 @@ public class GT_Loader_Item_Block_And_Fluid GregTech_API.sBlockConcretes = new GT_Block_Concretes(); GregTech_API.sBlockStones = new GT_Block_Stones(); GregTech_API.sBlockOres1 = new GT_Block_Ores(); + GregTech_API.sBlockOresUb1 = new GT_Block_Ores_UB1(); + GregTech_API.sBlockOresUb2 = new GT_Block_Ores_UB2(); + GregTech_API.sBlockOresUb3 = new GT_Block_Ores_UB3(); GregTech_API.sBlockMetal1 = new GT_Block_Metal("gt.blockmetal1", new Materials[]{ Materials.Adamantium, Materials.Aluminium, -- cgit From 676e326ec07ca32619154ac3468b44cfa59ca80d Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 22 Jul 2016 01:41:51 +0100 Subject: Various fixes/cleanup Game will no longer crash without UBC loaded Added missing mallet textures to materialicon Lignite --- .../gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/loaders/preload') 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 2b42c4cf14..f3fc20e0b1 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 @@ -1,6 +1,7 @@ package gregtech.loaders.preload; import codechicken.nei.api.API; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; @@ -137,9 +138,11 @@ public class GT_Loader_Item_Block_And_Fluid GregTech_API.sBlockConcretes = new GT_Block_Concretes(); GregTech_API.sBlockStones = new GT_Block_Stones(); GregTech_API.sBlockOres1 = new GT_Block_Ores(); - GregTech_API.sBlockOresUb1 = new GT_Block_Ores_UB1(); - GregTech_API.sBlockOresUb2 = new GT_Block_Ores_UB2(); - GregTech_API.sBlockOresUb3 = new GT_Block_Ores_UB3(); + if(Loader.isModLoaded("UndergroundBiomes")) { + GregTech_API.sBlockOresUb1 = new GT_Block_Ores_UB1(); + GregTech_API.sBlockOresUb2 = new GT_Block_Ores_UB2(); + GregTech_API.sBlockOresUb3 = new GT_Block_Ores_UB3(); + } GregTech_API.sBlockMetal1 = new GT_Block_Metal("gt.blockmetal1", new Materials[]{ Materials.Adamantium, Materials.Aluminium, -- cgit