diff --git a/1.11/To-Dos b/1.11/To-Dos index 75d60be8..fee2a500 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -4,9 +4,7 @@ To-Dos *** Priority *** -- [ ] Bloomery not accepting raw clean crucible -- [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer -- [ ] Add Yew + *** Feature Musket *** - [ ] Create powder charge item (copper, charcoal, gunpowder) @@ -20,6 +18,8 @@ To-Dos - [ ] Create lock assembly item *** Backlog *** +- [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer +- [ ] Add Yew - [ ] Add Iron Ring Recipe - [ ] Add chainmail recipe - [ ] Add Iron Shield diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 0c78d8dc..aa89826e 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,12 +5,12 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.21 +mod_version=1.2.22 forge_version=13.20.0.2226 mcp_mappings=snapshot_20161220 mc_version=1.11.2 -primal_version=0.3+ +primal_version=0.4+ jei_version=4.2+ waila_version=1.7.0-B3 apple_version=2.1+ \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index f51b85cf..5d3f43e5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -16,7 +16,7 @@ public class ModInfo { public static final String MOD_NAME = "Kitsu's ForgeCraft"; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.21"; + public static final String MOD_VERSION = "1.2.22"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" + "required-after:primal@[0.3.15,);"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index b8ad27aa..572d4bf4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import nmd.primal.core.api.PrimalItems; import nmd.primal.forgecraft.blocks.Anvil; import nmd.primal.forgecraft.blocks.IngotBall; +import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; @@ -36,8 +37,12 @@ public class TileAnvilRender extends TileEntitySpecialRenderer ; @Override - public void renderTileEntityAt(TileAnvil tile, double x, double y, double z, float partialTicks, int destroyStage) - { + public void renderTileEntityAt(TileAnvil tile, double x, double y, double z, float partialTicks, int destroyStage) { + + BlockPos pos = tile.getPos(); + IBlockState state = this.getWorld().getBlockState(pos); + if (state.getBlock() instanceof Anvil) { + GL11.glPushMatrix(); GL11.glTranslated(x, y + 1.5D, z); //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); @@ -45,10 +50,6 @@ public class TileAnvilRender extends TileEntitySpecialRenderer float prevLGTX = OpenGlHelper.lastBrightnessX; float prevLGTY = OpenGlHelper.lastBrightnessY; - BlockPos pos = tile.getPos(); - IBlockState state = this.getWorld().getBlockState(pos); - - int bright = tile.getWorld().getCombinedLight(pos.up(), 0); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); @@ -86,373 +87,375 @@ public class TileAnvilRender extends TileEntitySpecialRenderer 24 | 14/16 | 14/16 */ - if(state.getValue(Anvil.FACING) == EnumFacing.NORTH){ - int counter = 0; - for(int i=0; i < 5; i++){ - for(int a=0; a<5; a++){ - if(!tile.getSlotStack(counter).isEmpty()){ - Item item = tile.getSlotStack(counter).getItem(); - if(item.equals(Items.REDSTONE) || - (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || - item.equals(PrimalItems.EMERALD_KNAPP) || - item.equals(PrimalItems.DIAMOND_KNAPP) || - item.equals(Items.DIAMOND) || - item.equals(Items.EMERALD) - ){ - GL11.glPushMatrix(); - GL11.glTranslated( tile.getNormalX(a), -0.49D, tile.getNormalZ(i) ); - GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); - GL11.glScaled(0.25D, 0.25D, 0.25D); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.pickaxehead) || - item.equals(ModItems.cleanironpickaxehead) || - item.equals(ModItems.steelpickaxehead) || - item.equals(ModItems.wootzpickaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironaxehead) || - item.equals(ModItems.cleanironaxehead) || - item.equals(ModItems.steelaxehead) || - item.equals(ModItems.wootzaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironshovelhead) || - item.equals(ModItems.cleanironshovelhead) || - item.equals(ModItems.steelshovelhead) || - item.equals(ModItems.steelshovelhead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironhoehead)){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); - GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(Block.getBlockFromItem(item) instanceof IngotBall){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item instanceof BaseMultiItem){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } + if (state.getValue(Anvil.FACING) == EnumFacing.NORTH) { + int counter = 0; + for (int i = 0; i < 5; i++) { + for (int a = 0; a < 5; a++) { + if (!tile.getSlotStack(counter).isEmpty()) { + Item item = tile.getSlotStack(counter).getItem(); + if (item.equals(Items.REDSTONE) || + (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || + item.equals(PrimalItems.EMERALD_KNAPP) || + item.equals(PrimalItems.DIAMOND_KNAPP) || + item.equals(Items.DIAMOND) || + item.equals(Items.EMERALD) + ) { + GL11.glPushMatrix(); + GL11.glTranslated(tile.getNormalX(a), -0.49D, tile.getNormalZ(i)); + GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); + GL11.glScaled(0.25D, 0.25D, 0.25D); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.pickaxehead) || + item.equals(ModItems.cleanironpickaxehead) || + item.equals(ModItems.steelpickaxehead) || + item.equals(ModItems.wootzpickaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironaxehead) || + item.equals(ModItems.cleanironaxehead) || + item.equals(ModItems.steelaxehead) || + item.equals(ModItems.wootzaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironshovelhead) || + item.equals(ModItems.cleanironshovelhead) || + item.equals(ModItems.steelshovelhead) || + item.equals(ModItems.steelshovelhead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironhoehead)) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (Block.getBlockFromItem(item) instanceof IngotBall) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item instanceof BaseMultiItem) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + + } + counter++; } - counter++; } } - } - if(state.getValue(Anvil.FACING) == EnumFacing.SOUTH){ - int counter = 0; - for(int i=0; i < 5; i++){ - for(int a=0; a<5; a++){ - if(!tile.getSlotStack(counter).isEmpty()){ - Item item = tile.getSlotStack(counter).getItem(); - if(item.equals(Items.REDSTONE) || - (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || - item.equals(PrimalItems.EMERALD_KNAPP) || - item.equals(PrimalItems.DIAMOND_KNAPP) || - item.equals(Items.DIAMOND) || - item.equals(Items.EMERALD) - ){ - GL11.glPushMatrix(); - GL11.glTranslated( tile.getReverseX(a), -0.49D, tile.getReverseZ(i) ); - GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); - GL11.glScaled(0.25D, 0.25D, 0.25D); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.pickaxehead) || - item.equals(ModItems.cleanironpickaxehead) || - item.equals(ModItems.steelpickaxehead) || - item.equals(ModItems.wootzpickaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironaxehead) || - item.equals(ModItems.cleanironaxehead) || - item.equals(ModItems.steelaxehead) || - item.equals(ModItems.wootzaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironshovelhead) || - item.equals(ModItems.cleanironshovelhead) || - item.equals(ModItems.steelshovelhead) || - item.equals(ModItems.steelshovelhead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironhoehead) || - item.equals(ModItems.cleanironhoehead) || - item.equals(ModItems.steelhoehead) || - item.equals(ModItems.wootzhoehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(Block.getBlockFromItem(item) instanceof IngotBall){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.44D, tile.getReverseZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item instanceof BaseMultiItem){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.44D, tile.getReverseZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } + if (state.getValue(Anvil.FACING) == EnumFacing.SOUTH) { + int counter = 0; + for (int i = 0; i < 5; i++) { + for (int a = 0; a < 5; a++) { + if (!tile.getSlotStack(counter).isEmpty()) { + Item item = tile.getSlotStack(counter).getItem(); + if (item.equals(Items.REDSTONE) || + (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || + item.equals(PrimalItems.EMERALD_KNAPP) || + item.equals(PrimalItems.DIAMOND_KNAPP) || + item.equals(Items.DIAMOND) || + item.equals(Items.EMERALD) + ) { + GL11.glPushMatrix(); + GL11.glTranslated(tile.getReverseX(a), -0.49D, tile.getReverseZ(i)); + GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); + GL11.glScaled(0.25D, 0.25D, 0.25D); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.pickaxehead) || + item.equals(ModItems.cleanironpickaxehead) || + item.equals(ModItems.steelpickaxehead) || + item.equals(ModItems.wootzpickaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironaxehead) || + item.equals(ModItems.cleanironaxehead) || + item.equals(ModItems.steelaxehead) || + item.equals(ModItems.wootzaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironshovelhead) || + item.equals(ModItems.cleanironshovelhead) || + item.equals(ModItems.steelshovelhead) || + item.equals(ModItems.steelshovelhead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironhoehead) || + item.equals(ModItems.cleanironhoehead) || + item.equals(ModItems.steelhoehead) || + item.equals(ModItems.wootzhoehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (Block.getBlockFromItem(item) instanceof IngotBall) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.44D, tile.getReverseZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item instanceof BaseMultiItem) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.44D, tile.getReverseZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + } + counter++; } - counter++; } } - } - if(state.getValue(Anvil.FACING) == EnumFacing.WEST){ - int counter = 0; - for(int a=0; a < 5; a++){ - for(int i=0; i<5; i++){ - if(!tile.getSlotStack(counter).isEmpty()){ - Item item = tile.getSlotStack(counter).getItem(); - if(item.equals(Items.REDSTONE) || - (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || - item.equals(PrimalItems.EMERALD_KNAPP) || - item.equals(PrimalItems.DIAMOND_KNAPP) || - item.equals(Items.DIAMOND) || - item.equals(Items.EMERALD) - ){ - GL11.glPushMatrix(); - GL11.glTranslated( tile.getNormalX(a), -0.49D, tile.getReverseZ(i) ); - GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); - GL11.glScaled(0.25D, 0.25D, 0.25D); - GL11.glRotated(-90.0F, 0.0F, 0.0F, 1.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.pickaxehead) || - item.equals(ModItems.cleanironpickaxehead) || - item.equals(ModItems.steelpickaxehead) || - item.equals(ModItems.wootzpickaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(-90.0F, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironaxehead) || - item.equals(ModItems.cleanironaxehead) || - item.equals(ModItems.steelaxehead) || - item.equals(ModItems.wootzaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironshovelhead) || - item.equals(ModItems.cleanironshovelhead) || - item.equals(ModItems.steelshovelhead) || - item.equals(ModItems.steelshovelhead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironhoehead)){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.435D, tile.getReverseZ(i) ); - GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(Block.getBlockFromItem(item) instanceof IngotBall){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.44D, tile.getReverseZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item instanceof BaseMultiItem){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a), -0.44D, tile.getReverseZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); + if (state.getValue(Anvil.FACING) == EnumFacing.WEST) { + int counter = 0; + for (int a = 0; a < 5; a++) { + for (int i = 0; i < 5; i++) { + if (!tile.getSlotStack(counter).isEmpty()) { + Item item = tile.getSlotStack(counter).getItem(); + if (item.equals(Items.REDSTONE) || + (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || + item.equals(PrimalItems.EMERALD_KNAPP) || + item.equals(PrimalItems.DIAMOND_KNAPP) || + item.equals(Items.DIAMOND) || + item.equals(Items.EMERALD) + ) { + GL11.glPushMatrix(); + GL11.glTranslated(tile.getNormalX(a), -0.49D, tile.getReverseZ(i)); + GL11.glRotated(-90.0F, 1.0F, -0.0F, 0.0F); + GL11.glScaled(0.25D, 0.25D, 0.25D); + GL11.glRotated(-90.0F, 0.0F, 0.0F, 1.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.pickaxehead) || + item.equals(ModItems.cleanironpickaxehead) || + item.equals(ModItems.steelpickaxehead) || + item.equals(ModItems.wootzpickaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(-90.0F, 0.0F, 1.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironaxehead) || + item.equals(ModItems.cleanironaxehead) || + item.equals(ModItems.steelaxehead) || + item.equals(ModItems.wootzaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironshovelhead) || + item.equals(ModItems.cleanironshovelhead) || + item.equals(ModItems.steelshovelhead) || + item.equals(ModItems.steelshovelhead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironhoehead)) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getReverseZ(i)); + GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (Block.getBlockFromItem(item) instanceof IngotBall) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getReverseZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item instanceof BaseMultiItem) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getReverseZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } + counter++; } - counter++; } } - } - if(state.getValue(Anvil.FACING) == EnumFacing.EAST){ - int counter = 0; - for(int a=0; a < 5; a++){ - for(int i=0; i<5; i++){ - if(!tile.getSlotStack(counter).isEmpty()){ - Item item = tile.getSlotStack(counter).getItem(); - if(item.equals(Items.REDSTONE) || - (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || - item.equals(PrimalItems.EMERALD_KNAPP) || - item.equals(PrimalItems.DIAMOND_KNAPP) || - item.equals(Items.DIAMOND) || - item.equals(Items.EMERALD) - ){ - GL11.glPushMatrix(); - GL11.glTranslated( tile.getReverseX(a), -0.49D, tile.getNormalZ(i) ); - GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F); - GL11.glScaled(0.25D, 0.25D, 0.25D); - GL11.glRotated(-90.0F, 0.0F, 0.0F, 1.0F); - //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.pickaxehead) || - item.equals(ModItems.cleanironpickaxehead) || - item.equals(ModItems.steelpickaxehead) || - item.equals(ModItems.wootzpickaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getNormalZ(i) ); - GL11.glRotated(-90.0F, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironaxehead) || - item.equals(ModItems.cleanironaxehead) || - item.equals(ModItems.steelaxehead) || - item.equals(ModItems.wootzaxehead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getNormalZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironshovelhead) || - item.equals(ModItems.cleanironshovelhead) || - item.equals(ModItems.steelshovelhead) || - item.equals(ModItems.steelshovelhead) - ){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getNormalZ(i) ); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item.equals(ModItems.ironhoehead)){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.435D, tile.getNormalZ(i) ); - GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(Block.getBlockFromItem(item) instanceof IngotBall){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.44D, tile.getNormalZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - if(item instanceof BaseMultiItem){ - GL11.glPushMatrix(); - double scale = 1.0D; - GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a), -0.455D, tile.getNormalZ(i) ); - renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); + if (state.getValue(Anvil.FACING) == EnumFacing.EAST) { + int counter = 0; + for (int a = 0; a < 5; a++) { + for (int i = 0; i < 5; i++) { + if (!tile.getSlotStack(counter).isEmpty()) { + Item item = tile.getSlotStack(counter).getItem(); + if (item.equals(Items.REDSTONE) || + (item.equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) || + item.equals(PrimalItems.EMERALD_KNAPP) || + item.equals(PrimalItems.DIAMOND_KNAPP) || + item.equals(Items.DIAMOND) || + item.equals(Items.EMERALD) + ) { + GL11.glPushMatrix(); + GL11.glTranslated(tile.getReverseX(a), -0.49D, tile.getNormalZ(i)); + GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F); + GL11.glScaled(0.25D, 0.25D, 0.25D); + GL11.glRotated(-90.0F, 0.0F, 0.0F, 1.0F); + //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.pickaxehead) || + item.equals(ModItems.cleanironpickaxehead) || + item.equals(ModItems.steelpickaxehead) || + item.equals(ModItems.wootzpickaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(-90.0F, 0.0F, 1.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironaxehead) || + item.equals(ModItems.cleanironaxehead) || + item.equals(ModItems.steelaxehead) || + item.equals(ModItems.wootzaxehead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironshovelhead) || + item.equals(ModItems.cleanironshovelhead) || + item.equals(ModItems.steelshovelhead) || + item.equals(ModItems.steelshovelhead) + ) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item.equals(ModItems.ironhoehead)) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (Block.getBlockFromItem(item) instanceof IngotBall) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.44D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if (item instanceof BaseMultiItem) { + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.455D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } + counter++; } - counter++; } } - } - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); - GL11.glPopMatrix(); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); + GL11.glPopMatrix(); + } } private void doRendering(TileAnvil tile, Integer counter, Integer i, Integer a){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java index 422a0ddf..0cc59cc0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java @@ -1,5 +1,6 @@ package nmd.primal.forgecraft.renders.blocks; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderItem; @@ -8,6 +9,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import nmd.primal.forgecraft.blocks.Bloomery; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; @@ -19,55 +21,59 @@ public class TileBloomeryRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileBloomery tile, double x, double y, double z, float partialTicks, int destroyStage) - { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y + 0.0626D, z + 0.5D); - //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float prevLGTX = OpenGlHelper.lastBrightnessX; - float prevLGTY = OpenGlHelper.lastBrightnessY; + public void renderTileEntityAt(TileBloomery tile, double x, double y, double z, float partialTicks, int destroyStage) { + BlockPos pos = tile.getPos(); - int bright = tile.getWorld().getCombinedLight(pos.up(), 0); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); - - ItemStack stack0 = tile.getSlotStack(0); - ItemStack stack1 = tile.getSlotStack(1); - - - if (!stack0.isEmpty()) { - - boolean is_block = stack0.getItem() instanceof ItemBlock; - float scale = is_block ? 0.1725F : 0.3F; - double xTrans = is_block ? -1.6D : -0.45D; - double yTrans = is_block ? -1.26D : -0.7D; - int stackRotation = stack0.getCount(); + IBlockState state = this.getWorld().getBlockState(pos); + if (state.getBlock() instanceof Bloomery) { GL11.glPushMatrix(); - GL11.glScalef(scale, scale, scale); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(stack0, renderItem.getItemModelMesher().getItemModel(stack0)); - GL11.glPopMatrix(); + GL11.glTranslated(x + 0.5D, y + 0.0626D, z + 0.5D); + //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + float prevLGTX = OpenGlHelper.lastBrightnessX; + float prevLGTY = OpenGlHelper.lastBrightnessY; + int bright = tile.getWorld().getCombinedLight(pos.up(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); + + ItemStack stack0 = tile.getSlotStack(0); + ItemStack stack1 = tile.getSlotStack(1); + + + if (!stack0.isEmpty()) { + + boolean is_block = stack0.getItem() instanceof ItemBlock; + float scale = is_block ? 0.1725F : 0.3F; + double xTrans = is_block ? -1.6D : -0.45D; + double yTrans = is_block ? -1.26D : -0.7D; + int stackRotation = stack0.getCount(); - for(int i = 0; i < Math.ceil(stackRotation/8) + 1; i++){ GL11.glPushMatrix(); GL11.glScalef(scale, scale, scale); - GL11.glRotated(45.0F * i, 0.0F, 1.0F, 0.0F); GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslated(xTrans, yTrans, 0.0D); renderItem.renderItem(stack0, renderItem.getItemModelMesher().getItemModel(stack0)); GL11.glPopMatrix(); - } - } - if(!stack1.isEmpty()){ - GL11.glPushMatrix(); - GL11.glTranslated(0, 0.50D, 0); + for (int i = 0; i < Math.ceil(stackRotation / 8) + 1; i++) { + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + GL11.glRotated(45.0F * i, 0.0F, 1.0F, 0.0F); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslated(xTrans, yTrans, 0.0D); + renderItem.renderItem(stack0, renderItem.getItemModelMesher().getItemModel(stack0)); + GL11.glPopMatrix(); + } + } + + if (!stack1.isEmpty()) { + GL11.glPushMatrix(); + GL11.glTranslated(0, 0.50D, 0); renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); + GL11.glPopMatrix(); + } + + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); GL11.glPopMatrix(); } - - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); - GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java index e55f876d..00473a92 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java @@ -21,82 +21,85 @@ public class TileBreakerRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileBreaker tile, double x, double y, double z, float partialTicks, int destroyStage) - { - GL11.glPushMatrix(); - GL11.glTranslated(x , y, z); - GL11.glScalef(1.0f,1.0f,1.0f); - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float prevLGTX = OpenGlHelper.lastBrightnessX; - float prevLGTY = OpenGlHelper.lastBrightnessY; + public void renderTileEntityAt(TileBreaker tile, double x, double y, double z, float partialTicks, int destroyStage) { + BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); - int bright = tile.getWorld().getCombinedLight(pos.up(), 0); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); + if (state.getBlock() instanceof Breaker) { - //ItemStack stack0 = tile.getSlotStack(0); - - if(state.getValue(Breaker.FACING) == EnumFacing.NORTH) { GL11.glPushMatrix(); - GL11.glTranslated(0.5D, 0.450D, 0.7); - GL11.glRotated(90, 0.0f, 1.0f, 0.0f); - GL11.glRotatef(-135, 0.0f, 0.0f, 1.0f); + GL11.glTranslated(x, y, z); + GL11.glScalef(1.0f, 1.0f, 1.0f); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + float prevLGTX = OpenGlHelper.lastBrightnessX; + float prevLGTY = OpenGlHelper.lastBrightnessY; + int bright = tile.getWorld().getCombinedLight(pos.up(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); - GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, 1.0f); + //ItemStack stack0 = tile.getSlotStack(0); - GL11.glTranslatef(0.0f, 0.40f, 0.0f); - GL11.glTranslated(-0.45D, 0.0D, 0.0D); + if (state.getValue(Breaker.FACING) == EnumFacing.NORTH) { + GL11.glPushMatrix(); + GL11.glTranslated(0.5D, 0.450D, 0.7); + GL11.glRotated(90, 0.0f, 1.0f, 0.0f); + GL11.glRotatef(-135, 0.0f, 0.0f, 1.0f); - renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); + GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, 1.0f); + + GL11.glTranslatef(0.0f, 0.40f, 0.0f); + GL11.glTranslated(-0.45D, 0.0D, 0.0D); + + renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + + if (state.getValue(Breaker.FACING) == EnumFacing.EAST) { + GL11.glPushMatrix(); + GL11.glTranslated(0.3D, 0.450D, 0.5); + //GL11.glRotated(90, 0.0f, 1.0f, 0.0f); + GL11.glRotatef(-135, 0.0f, 0.0f, 1.0f); + + GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, 1.0f); + + GL11.glTranslatef(0.0f, 0.40f, 0.0f); + GL11.glTranslated(-0.45D, 0.0D, 0.0D); + + renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + + if (state.getValue(Breaker.FACING) == EnumFacing.SOUTH) { + GL11.glPushMatrix(); + GL11.glTranslated(0.5D, 0.450D, 0.3); + GL11.glRotated(90, 0.0f, 1.0f, 0.0f); + GL11.glRotatef(45, 0.0f, 0.0f, 1.0f); + + GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, -1.0f); + + GL11.glTranslatef(0.0f, 0.40f, 0.0f); + GL11.glTranslated(-0.45D, 0.0D, 0.0D); + + renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + + if (state.getValue(Breaker.FACING) == EnumFacing.WEST) { + GL11.glPushMatrix(); + GL11.glTranslated(0.7D, 0.450D, 0.5); + //GL11.glRotated(90, 0.0f, 1.0f, 0.0f); + GL11.glRotatef(45, 0.0f, 0.0f, 1.0f); + + GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, -1.0f); + + GL11.glTranslatef(0.0f, 0.40f, 0.0f); + GL11.glTranslated(-0.45D, 0.0D, 0.0D); + + renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); GL11.glPopMatrix(); } - - if(state.getValue(Breaker.FACING) == EnumFacing.EAST) { - GL11.glPushMatrix(); - GL11.glTranslated(0.3D, 0.450D, 0.5); - //GL11.glRotated(90, 0.0f, 1.0f, 0.0f); - GL11.glRotatef(-135, 0.0f, 0.0f, 1.0f); - - GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, 1.0f); - - GL11.glTranslatef(0.0f, 0.40f, 0.0f); - GL11.glTranslated(-0.45D, 0.0D, 0.0D); - - renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - - if(state.getValue(Breaker.FACING) == EnumFacing.SOUTH) { - GL11.glPushMatrix(); - GL11.glTranslated(0.5D, 0.450D, 0.3); - GL11.glRotated(90, 0.0f, 1.0f, 0.0f); - GL11.glRotatef(45, 0.0f, 0.0f, 1.0f); - - GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, -1.0f); - - GL11.glTranslatef(0.0f, 0.40f, 0.0f); - GL11.glTranslated(-0.45D, 0.0D, 0.0D); - - renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - - if(state.getValue(Breaker.FACING) == EnumFacing.WEST) { - GL11.glPushMatrix(); - GL11.glTranslated(0.7D, 0.450D, 0.5); - //GL11.glRotated(90, 0.0f, 1.0f, 0.0f); - GL11.glRotatef(45, 0.0f, 0.0f, 1.0f); - - GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, -1.0f); - - GL11.glTranslatef(0.0f, 0.40f, 0.0f); - GL11.glTranslated(-0.45D, 0.0D, 0.0D); - - renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); - GL11.glPopMatrix(); - } - - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); - GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java index ba98b08b..34772fe5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java @@ -1,5 +1,6 @@ package nmd.primal.forgecraft.renders.blocks; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderItem; @@ -10,6 +11,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileForge; import org.lwjgl.opengl.GL11; @@ -22,106 +24,111 @@ public class TileForgeRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileForge tile, double x, double y, double z, float partialTicks, int destroyStage) - { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y + 0.95D, z + 0.5D); - //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float prevLGTX = OpenGlHelper.lastBrightnessX; - float prevLGTY = OpenGlHelper.lastBrightnessY; + public void renderTileEntityAt(TileForge tile, double x, double y, double z, float partialTicks, int destroyStage) { + BlockPos pos = tile.getPos(); - int bright = tile.getWorld().getCombinedLight(pos.up(), 0); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); + IBlockState state = this.getWorld().getBlockState(pos); + if (state.getBlock() instanceof Forge) { - ItemStack stack1 = tile.getSlotStack(0); - - boolean is_block = stack1.getItem() instanceof ItemBlock; - float scale = is_block ? 0.1725F : 0.3F; - double xTrans = is_block ? -1.6D : -0.45D; - double yTrans = is_block ? -1.26D : 0.75D; - - if (!stack1.isEmpty()) { - int stackRotation = stack1.getCount(); GL11.glPushMatrix(); - GL11.glScalef(scale, scale, scale); - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); - GL11.glPopMatrix(); - for(int i = 0; i < Math.ceil(stackRotation/8) + 1; i++){ + GL11.glTranslated(x + 0.5D, y + 0.95D, z + 0.5D); + //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + float prevLGTX = OpenGlHelper.lastBrightnessX; + float prevLGTY = OpenGlHelper.lastBrightnessY; + + int bright = tile.getWorld().getCombinedLight(pos.up(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); + + ItemStack stack1 = tile.getSlotStack(0); + + boolean is_block = stack1.getItem() instanceof ItemBlock; + float scale = is_block ? 0.1725F : 0.3F; + double xTrans = is_block ? -1.6D : -0.45D; + double yTrans = is_block ? -1.26D : 0.75D; + + if (!stack1.isEmpty()) { + int stackRotation = stack1.getCount(); GL11.glPushMatrix(); GL11.glScalef(scale, scale, scale); - GL11.glRotated(45.0F * i, 0.0F, 1.0F, 0.0F); GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslated(xTrans, yTrans, 0.0D); renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); GL11.glPopMatrix(); + for (int i = 0; i < Math.ceil(stackRotation / 8) + 1; i++) { + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + GL11.glRotated(45.0F * i, 0.0F, 1.0F, 0.0F); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslated(xTrans, yTrans, 0.0D); + renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); + GL11.glPopMatrix(); + } } - } - for(int i=2; i < tile.getSlotListSize(); i++){ - if(!tile.getSlotStack(i).isEmpty()){ - GL11.glPushMatrix(); - float tempScale = 0.8F; - GL11.glScalef(tempScale, tempScale, tempScale); - GL11.glTranslated(0.0F, 0.1D, 0.0F); - if(i == 2){ - GL11.glTranslated(-0.3, -0.05D, -0.3D); - if(tile.getSlotStack(i).getItem() == Items.IRON_INGOT){ - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + for (int i = 2; i < tile.getSlotListSize(); i++) { + if (!tile.getSlotStack(i).isEmpty()) { + GL11.glPushMatrix(); + float tempScale = 0.8F; + GL11.glScalef(tempScale, tempScale, tempScale); + GL11.glTranslated(0.0F, 0.1D, 0.0F); + if (i == 2) { + GL11.glTranslated(-0.3, -0.05D, -0.3D); + if (tile.getSlotStack(i).getItem() == Items.IRON_INGOT) { + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + } } - } - if(i == 3){ - GL11.glTranslated(-0.3, -0.05D, 0.3D); - if(tile.getSlotStack(i).getItem() == Items.IRON_INGOT){ - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + if (i == 3) { + GL11.glTranslated(-0.3, -0.05D, 0.3D); + if (tile.getSlotStack(i).getItem() == Items.IRON_INGOT) { + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + } } - } - if(i == 4){ - if(tile.getSlotStack(i).getItem() == Items.IRON_INGOT){ - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + if (i == 4) { + if (tile.getSlotStack(i).getItem() == Items.IRON_INGOT) { + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + } + //GL11.glScalef(0.6F, 0.6F, 0.6F); + if (tile.getSlotStack(i).getItem() == ModItems.pickaxehead) { + GL11.glRotated(180.0F, 0.0F, 1.0F, 0.0F); + } + if (tile.getSlotStack(i).getItem() == ModItems.ironaxehead) { + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + } + if (tile.getSlotStack(i).getItem() == ModItems.ironshovelhead) { + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + } + if (tile.getSlotStack(i).getItem() == ModItems.ironhoehead) { + GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslated(0.0, 0.025D, 0.0D); + } + } - //GL11.glScalef(0.6F, 0.6F, 0.6F); - if(tile.getSlotStack(i).getItem() == ModItems.pickaxehead) { - GL11.glRotated(180.0F, 0.0F, 1.0F, 0.0F); + if (i == 5) { + GL11.glTranslated(0.3, -0.05D, -0.3D); + if (tile.getSlotStack(i).getItem() == Items.IRON_INGOT) { + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + } } - if(tile.getSlotStack(i).getItem() == ModItems.ironaxehead) { - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - } - if(tile.getSlotStack(i).getItem() == ModItems.ironshovelhead) { - GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); - } - if(tile.getSlotStack(i).getItem() == ModItems.ironhoehead) { - GL11.glRotated(180.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslated(0.0, 0.025D, 0.0D); + if (i == 6) { + GL11.glTranslated(0.3, -0.05D, 0.3D); + if (tile.getSlotStack(i).getItem() == Items.IRON_INGOT) { + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); + } } + renderItem.renderItem(tile.getSlotStack(i), ItemCameraTransforms.TransformType.FIXED); + //renderItem.renderItem(tile.getSlotStack(i), renderItem.getItemModelMesher().getItemModel(tile.getSlotStack(i))); + GL11.glPopMatrix(); } - if(i == 5){ - GL11.glTranslated(0.3, -0.05D, -0.3D); - if(tile.getSlotStack(i).getItem() == Items.IRON_INGOT){ - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); - } - } - if(i == 6){ - GL11.glTranslated(0.3, -0.05D, 0.3D); - if(tile.getSlotStack(i).getItem() == Items.IRON_INGOT){ - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotated(90.0F, 1.0f, 0.0f, 0.0f); - } - } - - renderItem.renderItem(tile.getSlotStack(i), ItemCameraTransforms.TransformType.FIXED); - //renderItem.renderItem(tile.getSlotStack(i), renderItem.getItemModelMesher().getItemModel(tile.getSlotStack(i))); - GL11.glPopMatrix(); } - } - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); - GL11.glPopMatrix(); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); + GL11.glPopMatrix(); + } } } \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java index 6e3fc6cd..0b47ba07 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java @@ -24,63 +24,70 @@ public class TilePistonBellowsRender extends TileEntitySpecialRenderer