diff options
| author | KiloJoel <kilojoel@gmail.com> | 2021-01-29 20:59:30 +0000 |
|---|---|---|
| committer | KiloJoel <kilojoel@gmail.com> | 2021-01-29 20:59:30 +0000 |
| commit | 6eeda305421acf320c97ec7c7ba4befb66783c3a (patch) | |
| tree | 22e4855a16ceebcfb60878a7533c9756d105a012 /src/main | |
| parent | 209bd9df83e91df6c4f5ec02060087a81f433288 (diff) | |
| download | GT5-Unofficial-6eeda305421acf320c97ec7c7ba4befb66783c3a.tar.gz GT5-Unofficial-6eeda305421acf320c97ec7c7ba4befb66783c3a.tar.bz2 GT5-Unofficial-6eeda305421acf320c97ec7c7ba4befb66783c3a.zip | |
added GT shadowmetal block, no texture yet
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 38001faebb..22dfc810d2 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -69,6 +69,7 @@ public class Textures { BLOCK_STEELEAF, BLOCK_ICHORIUM, BLOCK_FIRESTONE, + BLOCK_SHADOW, OVERLAY_ENERGY_IN_POWER, OVERLAY_ENERGY_OUT_POWER, @@ -1288,7 +1289,8 @@ public class Textures { BLOCK_HSSS, BLOCK_STEELEAF, BLOCK_ICHORIUM, - BLOCK_FIRESTONE + BLOCK_FIRESTONE, + BLOCK_SHADOW }, STORAGE_BLOCKS9 = new IIconContainer[]{ BLOCK_AERCRYSTAL, diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 097c2dd034..60e3b031fe 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1234,7 +1234,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCChaos"), getSpecies(MAGICBEES, "TCVoid"), 6); if (Loader.isModLoaded("TaintedMagic")) - tMutation.requireResource(GameRegistry.findBlock("TaintedMagic", "BlockShadowmetal"), 0); + tMutation.requireResource("blockShadow"); } ), DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), 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 7e91f6ef7c..4a03b3d3a3 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 @@ -379,6 +379,7 @@ public class GT_Loader_Item_Block_And_Fluid Materials.Steeleaf, Materials.Ichorium, Materials.Firestone, + Materials.Shadow }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8); GregTech_API.sBlockGem1 = new GT_Block_Metal("gt.blockgem1", new Materials[]{ |