diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-01-30 10:43:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 10:43:09 +0100 |
| commit | 75c6aa4b3d22b82266115841a0bfee2eb4b07e6f (patch) | |
| tree | 61121995a7beb96b61986e453a7883fad615c839 /src/main/java | |
| parent | 38b2f0bda401535d8ec1c223334d1b40ea293c64 (diff) | |
| parent | 868dc9d8458c2b753414496a55f8e9322ae6484c (diff) | |
| download | GT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.tar.gz GT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.tar.bz2 GT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.zip | |
Merge pull request #426 from KiloJoel/shadowmetalBeeFix
added GT shadowmetal block, fixed bee crash from new TM
Diffstat (limited to 'src/main/java')
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 5d38b46d3d..3a9af71aa2 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -80,6 +80,7 @@ public class Textures { BLOCK_STEELEAF, BLOCK_ICHORIUM, BLOCK_FIRESTONE, + BLOCK_SHADOW, OVERLAY_ENERGY_IN_POWER, OVERLAY_ENERGY_OUT_POWER, @@ -1304,7 +1305,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 87a87295a7..1dc98d6949 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 @@ -365,6 +365,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 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[]{ |