From b0c77d4d22b1d1325bfdf730307c5a72b50f39b3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 3 Oct 2015 20:29:02 +0100 Subject: [PATCH] Fixed server crash --- .../techreborn/blocks/BlockMachineCasing.java | 50 ++++++------------- .../blocks/storage/BlockLesuStorage.java | 50 +++++++------------ .../CasingConnectedTextureGenerator.java | 22 ++++++++ .../LesuConnectedTextureGenerator.java | 19 +++++++ 4 files changed, 74 insertions(+), 67 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 1508efa92..840f74bf5 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -6,8 +6,6 @@ import erogenousbeef.coreTR.multiblock.BlockMultiblockBase; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -82,42 +80,26 @@ public class BlockMachineCasing extends BlockMultiblockBase { } for (int i = 0; i < types.length; i++) { // up down left right - icons[i][0] = genIcon(new ConnectedTexture(true, true, true, true), iconRegister, 0, i); - icons[i][1] = genIcon(new ConnectedTexture(true, false, true, true), iconRegister, 1, i); - icons[i][2] = genIcon(new ConnectedTexture(false, true, true, true), iconRegister, 2, i); - icons[i][3] = genIcon(new ConnectedTexture(true, true, true, false), iconRegister, 3, i); - icons[i][4] = genIcon(new ConnectedTexture(true, true, false, true), iconRegister, 4, i); - icons[i][5] = genIcon(new ConnectedTexture(true, true, false, false), iconRegister, 5, i); - icons[i][6] = genIcon(new ConnectedTexture(false, false, true, true), iconRegister, 6, i); - icons[i][7] = genIcon(new ConnectedTexture(false, true, false, true), iconRegister, 7, i); - icons[i][8] = genIcon(new ConnectedTexture(false, true, true, false), iconRegister, 8, i); - icons[i][9] = genIcon(new ConnectedTexture(true, false, false, true), iconRegister, 9, i); - icons[i][10] = genIcon(new ConnectedTexture(true, false, true, false), iconRegister, 10, i); - icons[i][11] = genIcon(new ConnectedTexture(false, true, false, false), iconRegister, 11, i); - icons[i][12] = genIcon(new ConnectedTexture(true, false, false, false), iconRegister, 12, i); - icons[i][13] = genIcon(new ConnectedTexture(false, false, false, true), iconRegister, 13, i); - icons[i][14] = genIcon(new ConnectedTexture(false, false, true, false), iconRegister, 14, i); - icons[i][15] = genIcon(new ConnectedTexture(false, false, false, false), iconRegister, 15, i); + icons[i][0] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, true, true), iconRegister, 0, i, types); + icons[i][1] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, true, true), iconRegister, 1, i, types); + icons[i][2] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, true, true), iconRegister, 2, i, types); + icons[i][3] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, true, false), iconRegister, 3, i, types); + icons[i][4] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, false, true), iconRegister, 4, i, types); + icons[i][5] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, false, false), iconRegister, 5, i, types); + icons[i][6] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, true, true), iconRegister, 6, i, types); + icons[i][7] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, false, true), iconRegister, 7, i, types); + icons[i][8] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, true, false), iconRegister, 8, i, types); + icons[i][9] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, false, true), iconRegister, 9, i, types); + icons[i][10] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, true, false), iconRegister, 10, i, types); + icons[i][11] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, false, false), iconRegister, 11, i, types); + icons[i][12] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, false, false), iconRegister, 12, i, types); + icons[i][13] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, false, true), iconRegister, 13, i, types); + icons[i][14] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, true, false), iconRegister, 14, i, types); + icons[i][15] = CasingConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, false, false), iconRegister, 15, i, types); } } - public IIcon genIcon(ConnectedTexture connectedTexture, IIconRegister iconRegister, int texNum, int meta) { - if (iconRegister instanceof TextureMap) { - TextureMap map = (TextureMap) iconRegister; - String name = CasingConnectedTextureGenerator.getDerivedName(types[meta] + "." + texNum); - System.out.println(name); - TextureAtlasSprite texture = map.getTextureExtry(name); - if (texture == null) { - texture = new CasingConnectedTextureGenerator(name, types[meta], connectedTexture); - map.setTextureEntry(name, texture); - } - return map.getTextureExtry(name); - } else { - return null; - } - } - @Override @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java index 3f4cdf015..362f3dd32 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java @@ -5,8 +5,6 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -41,22 +39,22 @@ public class BlockLesuStorage extends BlockMachineBase { } int i = 0; - icons[i][0] = genIcon(new ConnectedTexture(true, true, true, true), iconRegister, 0, i); - icons[i][1] = genIcon(new ConnectedTexture(true, false, true, true), iconRegister, 1, i); - icons[i][2] = genIcon(new ConnectedTexture(false, true, true, true), iconRegister, 2, i); - icons[i][3] = genIcon(new ConnectedTexture(true, true, true, false), iconRegister, 3, i); - icons[i][4] = genIcon(new ConnectedTexture(true, true, false, true), iconRegister, 4, i); - icons[i][5] = genIcon(new ConnectedTexture(true, true, false, false), iconRegister, 5, i); - icons[i][6] = genIcon(new ConnectedTexture(false, false, true, true), iconRegister, 6, i); - icons[i][7] = genIcon(new ConnectedTexture(false, true, false, true), iconRegister, 7, i); - icons[i][8] = genIcon(new ConnectedTexture(false, true, true, false), iconRegister, 8, i); - icons[i][9] = genIcon(new ConnectedTexture(true, false, false, true), iconRegister, 9, i); - icons[i][10] = genIcon(new ConnectedTexture(true, false, true, false), iconRegister, 10, i); - icons[i][11] = genIcon(new ConnectedTexture(false, true, false, false), iconRegister, 11, i); - icons[i][12] = genIcon(new ConnectedTexture(true, false, false, false), iconRegister, 12, i); - icons[i][13] = genIcon(new ConnectedTexture(false, false, false, true), iconRegister, 13, i); - icons[i][14] = genIcon(new ConnectedTexture(false, false, true, false), iconRegister, 14, i); - icons[i][15] = genIcon(new ConnectedTexture(false, false, false, false), iconRegister, 15, i); + icons[i][0] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, true, true), iconRegister, 0, i); + icons[i][1] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, true, true), iconRegister, 1, i); + icons[i][2] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, true, true), iconRegister, 2, i); + icons[i][3] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, true, false), iconRegister, 3, i); + icons[i][4] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, false, true), iconRegister, 4, i); + icons[i][5] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, true, false, false), iconRegister, 5, i); + icons[i][6] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, true, true), iconRegister, 6, i); + icons[i][7] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, false, true), iconRegister, 7, i); + icons[i][8] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, true, false), iconRegister, 8, i); + icons[i][9] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, false, true), iconRegister, 9, i); + icons[i][10] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, true, false), iconRegister, 10, i); + icons[i][11] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, true, false, false), iconRegister, 11, i); + icons[i][12] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(true, false, false, false), iconRegister, 12, i); + icons[i][13] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, false, true), iconRegister, 13, i); + icons[i][14] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, true, false), iconRegister, 14, i); + icons[i][15] = LesuConnectedTextureGenerator.genIcon(new ConnectedTexture(false, false, false, false), iconRegister, 15, i); } @Override @@ -71,21 +69,7 @@ public class BlockLesuStorage extends BlockMachineBase { } - public IIcon genIcon(ConnectedTexture connectedTexture, IIconRegister iconRegister, int texNum, int meta) { - if (iconRegister instanceof TextureMap) { - TextureMap map = (TextureMap) iconRegister; - String name = LesuConnectedTextureGenerator.getDerivedName("lesu." + texNum); - System.out.println(name); - TextureAtlasSprite texture = map.getTextureExtry(name); - if (texture == null) { - texture = new LesuConnectedTextureGenerator(name, "lesu", connectedTexture); - map.setTextureEntry(name, texture); - } - return map.getTextureExtry(name); - } else { - return null; - } - } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemstack) { diff --git a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java index 7d0499b43..f9a96de76 100644 --- a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java @@ -1,10 +1,15 @@ package techreborn.client.texture; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.data.AnimationMetadataSection; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import techreborn.lib.ModInfo; @@ -116,4 +121,21 @@ public class CasingConnectedTextureGenerator extends TextureAtlasSprite { this.loadSprite(type_image, animation, (float) Minecraft.getMinecraft().gameSettings.anisotropicFiltering > 1.0F); return false; } + + @SideOnly(Side.CLIENT) + public static IIcon genIcon(ConnectedTexture connectedTexture, IIconRegister iconRegister, int texNum, int meta, String[] types) { + if (iconRegister instanceof TextureMap) { + TextureMap map = (TextureMap) iconRegister; + String name = CasingConnectedTextureGenerator.getDerivedName(types[meta] + "." + texNum); + System.out.println(name); + TextureAtlasSprite texture = map.getTextureExtry(name); + if (texture == null) { + texture = new CasingConnectedTextureGenerator(name, types[meta], connectedTexture); + map.setTextureEntry(name, texture); + } + return map.getTextureExtry(name); + } else { + return null; + } + } } diff --git a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java index a35149455..8ed13ac9c 100644 --- a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java @@ -1,10 +1,13 @@ package techreborn.client.texture; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.data.AnimationMetadataSection; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import techreborn.lib.ModInfo; @@ -121,4 +124,20 @@ public class LesuConnectedTextureGenerator extends TextureAtlasSprite { this.loadSprite(type_image, animation, (float) Minecraft.getMinecraft().gameSettings.anisotropicFiltering > 1.0F); return false; } + + public static IIcon genIcon(ConnectedTexture connectedTexture, IIconRegister iconRegister, int texNum, int meta) { + if (iconRegister instanceof TextureMap) { + TextureMap map = (TextureMap) iconRegister; + String name = LesuConnectedTextureGenerator.getDerivedName("lesu." + texNum); + System.out.println(name); + TextureAtlasSprite texture = map.getTextureExtry(name); + if (texture == null) { + texture = new LesuConnectedTextureGenerator(name, "lesu", connectedTexture); + map.setTextureEntry(name, texture); + } + return map.getTextureExtry(name); + } else { + return null; + } + } }