diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index 4de761aea..bbf510513 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -20,6 +20,7 @@ import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -39,6 +40,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + public BlockAtomicReconstructor(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -47,6 +50,11 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java index 13c8abfc8..f8e5be1f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java @@ -21,6 +21,7 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -37,6 +38,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBookletStand extends BlockContainerBase implements IHudDisplay{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); + public BlockBookletStand(String name){ super(Material.wood, name); this.setHarvestLevel("axe", 0); @@ -48,6 +51,11 @@ public class BlockBookletStand extends BlockContainerBase implements IHudDisplay this.setBlockBounds(f, 0F, f, 1F-f, 1F-4*f, 1F-f); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public int getRenderType(){ return AssetUtil.TESR_RENDER_ID; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index 3668e1229..1077968f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -31,6 +32,7 @@ import net.minecraft.world.World; public class BlockBreaker extends BlockContainerBase{ private boolean isPlacer; + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); public BlockBreaker(boolean isPlacer, String name){ super(Material.rock, name); @@ -41,6 +43,11 @@ public class BlockBreaker extends BlockContainerBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isPlacer ? new TileEntityBreaker.TileEntityPlacer() : new TileEntityBreaker(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index 7a0e7fdb1..7017e7e06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -34,6 +35,8 @@ import java.util.Random; public class BlockCoalGenerator extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 1); + public BlockCoalGenerator(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -43,6 +46,11 @@ public class BlockCoalGenerator extends BlockContainerBase{ this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityCoalGenerator(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index d4afda732..c27be20aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +31,8 @@ import net.minecraft.world.World; public class BlockCoffeeMachine extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); + public BlockCoffeeMachine(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -41,6 +44,11 @@ public class BlockCoffeeMachine extends BlockContainerBase{ this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public int getRenderType(){ return AssetUtil.TESR_RENDER_ID; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index fb709f589..628a63863 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -19,6 +19,7 @@ import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -39,6 +40,7 @@ import java.util.Random; public class BlockColoredLamp extends BlockBase{ public static TheColoredLampColors[] allLampTypes = TheColoredLampColors.values(); + private static final PropertyInteger META = PropertyInteger.create("meta", 0, allLampTypes.length-1); public boolean isOn; public BlockColoredLamp(boolean isOn, String name){ @@ -49,6 +51,11 @@ public class BlockColoredLamp extends BlockBase{ this.isOn = isOn; } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public Item getItemDropped(IBlockState state, Random rand, int par3){ return Item.getItemFromBlock(InitBlocks.blockColoredLamp); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 080174425..46a0263f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -31,6 +32,7 @@ import java.util.List; public class BlockCrystal extends BlockBase{ public static final TheCrystals[] allCrystals = TheCrystals.values(); + private static final PropertyInteger META = PropertyInteger.create("meta", 0, allCrystals.length-1); public BlockCrystal(String name){ super(Material.rock, name); @@ -39,6 +41,11 @@ public class BlockCrystal extends BlockBase{ this.setHarvestLevel("pickaxe", 1); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public int damageDropped(IBlockState state){ return this.getMetaFromState(state); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index 0dc6cfc1b..0082f798a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +31,8 @@ import net.minecraft.world.World; public class BlockDirectionalBreaker extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + public BlockDirectionalBreaker(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -38,6 +41,11 @@ public class BlockDirectionalBreaker extends BlockContainerBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityDirectionalBreaker(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index 686d4fbf5..67e26bea4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,6 +30,8 @@ import net.minecraft.world.World; public class BlockDropper extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + public BlockDropper(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -36,6 +39,10 @@ public class BlockDropper extends BlockContainerBase{ this.setResistance(10.0F); this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } @Override public TileEntity createNewTileEntity(World world, int par2){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index b72624706..84fb63f54 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +31,8 @@ import net.minecraft.world.World; public class BlockFluidCollector extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + private boolean isPlacer; public BlockFluidCollector(boolean isPlacer, String name){ @@ -41,6 +44,11 @@ public class BlockFluidCollector extends BlockContainerBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isPlacer ? new TileEntityFluidCollector.TileEntityFluidPlacer() : new TileEntityFluidCollector(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index fcb732c2c..1b44fe834 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -36,6 +37,8 @@ import java.util.Random; public class BlockFurnaceDouble extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 7); + public BlockFurnaceDouble(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -45,6 +48,11 @@ public class BlockFurnaceDouble extends BlockContainerBase{ this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFurnaceDouble(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 1f20a8862..fc2805758 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -35,6 +36,7 @@ import java.util.Random; public class BlockGrinder extends BlockContainerBase{ private final boolean isDouble; + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 1); public BlockGrinder(boolean isDouble, String name){ super(Material.rock, name); @@ -46,6 +48,11 @@ public class BlockGrinder extends BlockContainerBase{ this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isDouble ? new TileEntityGrinder.TileEntityGrinderDouble() : new TileEntityGrinder(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index 2fb4d56d3..710afc2dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumRarity; @@ -26,6 +27,8 @@ import net.minecraft.world.World; public class BlockLampPowerer extends BlockBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + public BlockLampPowerer(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -34,6 +37,11 @@ public class BlockLampPowerer extends BlockBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock){ this.updateLamp(world, pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 9849619e0..73d95fa11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,6 +32,8 @@ import java.util.List; public class BlockLaserRelay extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); + public BlockLaserRelay(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -39,6 +42,11 @@ public class BlockLaserRelay extends BlockContainerBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB axis, List list, Entity entity){ this.setBlockBoundsBasedOnState(world, pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index bf0131bd9..52106f979 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -29,6 +30,7 @@ import java.util.List; public class BlockMisc extends BlockBase{ public static final TheMiscBlocks[] allMiscBlocks = TheMiscBlocks.values(); + private static final PropertyInteger META = PropertyInteger.create("meta", 0, allMiscBlocks.length-1); public BlockMisc(String name){ super(Material.rock, name); @@ -37,6 +39,11 @@ public class BlockMisc extends BlockBase{ this.setHarvestLevel("pickaxe", 1); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public int damageDropped(IBlockState state){ return this.getMetaFromState(state); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 4b4c0e2c8..fe4a88625 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -34,6 +35,8 @@ import java.util.Random; public class BlockOilGenerator extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 1); + public BlockOilGenerator(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -43,6 +46,11 @@ public class BlockOilGenerator extends BlockContainerBase{ this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityOilGenerator(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index d81f82da5..29d1da66f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.Block; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -37,6 +38,8 @@ public class BlockSlabs extends BlockBase{ this(name, fullBlock, 0); } + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 1); + public BlockSlabs(String name, Block fullBlock, int meta){ super(fullBlock.getMaterial(), name); this.setHardness(1.5F); @@ -45,6 +48,11 @@ public class BlockSlabs extends BlockBase{ this.meta = meta; } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB axis, List list, Entity entity){ this.setBlockBoundsBasedOnState(world, pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 1c1687ed6..2c732a07e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -20,6 +20,7 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -38,6 +39,8 @@ import java.util.Random; public class BlockSmileyCloud extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); + public BlockSmileyCloud(String name){ super(Material.cloth, name); this.setHardness(0.5F); @@ -45,6 +48,10 @@ public class BlockSmileyCloud extends BlockContainerBase{ this.setStepSound(soundTypeCloth); this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } @Override public int getRenderType(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index ec3bfed7a..d8eed6bc5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -34,6 +35,8 @@ import java.util.Random; public class BlockTreasureChest extends BlockBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); + public BlockTreasureChest(String name){ super(Material.wood, name); this.setHarvestLevel("axe", 0); @@ -43,6 +46,11 @@ public class BlockTreasureChest extends BlockBase{ this.setTickRandomly(true); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index 30a94f885..0174093bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -19,6 +19,7 @@ import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -37,12 +38,18 @@ import java.util.List; public class BlockWildPlant extends BlockBushBase{ public static final TheWildPlants[] allWildPlants = TheWildPlants.values(); + private static final PropertyInteger META = PropertyInteger.create("meta", 0, allWildPlants.length-1); public BlockWildPlant(String name){ super(name); this.setStepSound(soundTypeGrass); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public boolean canBlockStay(World world, BlockPos pos, IBlockState state){ BlockPos offset = PosUtil.offset(pos, 0, -1, 0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 56618d060..b9fc6797d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -19,6 +19,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -33,6 +34,8 @@ import net.minecraft.world.World; public class BlockXPSolidifier extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); + public BlockXPSolidifier(String name){ super(Material.rock, name); this.setHarvestLevel("pickaxe", 0); @@ -41,6 +44,11 @@ public class BlockXPSolidifier extends BlockContainerBase{ this.setStepSound(soundTypeStone); } + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityXPSolidifier(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index 4c791c41a..54f252f67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -162,13 +162,13 @@ public class InitBlocks{ blockCoalGenerator = new BlockCoalGenerator("blockCoalGenerator"); blockOilGenerator = new BlockOilGenerator("blockOilGenerator"); blockFermentingBarrel = new BlockFermentingBarrel("blockFermentingBarrel"); - blockRice = new BlockPlant("blockRice", 6, 1, 2); + blockRice = new BlockPlant("blockRice", 1, 2); CompatUtil.registerMFRPlant(blockRice); - blockCanola = new BlockPlant("blockCanola", 4, 5, 5); + blockCanola = new BlockPlant("blockCanola", 5, 5); CompatUtil.registerMFRPlant(blockCanola); - blockFlax = new BlockPlant("blockFlax", 6, 2, 4); + blockFlax = new BlockPlant("blockFlax", 2, 4); CompatUtil.registerMFRPlant(blockFlax); - blockCoffee = new BlockPlant("blockCoffee", 6, 2, 2); + blockCoffee = new BlockPlant("blockCoffee", 2, 2); CompatUtil.registerMFRPlant(blockCoffee); blockCompost = new BlockCompost("blockCompost"); blockMisc = new BlockMisc("blockMisc"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index 25cc4c1c0..8b278af9b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -12,9 +12,9 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; @@ -61,16 +61,20 @@ public class BlockBase extends Block{ @Override protected BlockState createBlockState(){ - return new BlockState(this, PosUtil.META); + return this.getMetaProperty() == null ? super.createBlockState() : new BlockState(this, this.getMetaProperty()); } @Override public IBlockState getStateFromMeta(int meta){ - return getDefaultState().withProperty(PosUtil.META, meta); + return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); } @Override public int getMetaFromState(IBlockState state){ - return state.getValue(PosUtil.META); + return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty()); + } + + protected PropertyInteger getMetaProperty(){ + return null; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index 1f459215c..58c407a74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -12,8 +12,8 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; import net.minecraft.block.BlockBush; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; @@ -25,7 +25,6 @@ public class BlockBushBase extends BlockBush{ private String name; public BlockBushBase(String name){ - this.setStepSound(soundTypeGrass); this.name = name; this.register(); @@ -60,16 +59,20 @@ public class BlockBushBase extends BlockBush{ @Override protected BlockState createBlockState(){ - return new BlockState(this, PosUtil.META); + return this.getMetaProperty() == null ? super.createBlockState() : new BlockState(this, this.getMetaProperty()); } @Override public IBlockState getStateFromMeta(int meta){ - return getDefaultState().withProperty(PosUtil.META, meta); + return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); } @Override public int getMetaFromState(IBlockState state){ - return state.getValue(PosUtil.META); + return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty()); + } + + protected PropertyInteger getMetaProperty(){ + return null; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index 91288deb7..1107eba4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -13,12 +13,12 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.tile.*; import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockRedstoneTorch; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -262,16 +262,20 @@ public abstract class BlockContainerBase extends BlockContainer{ @Override protected BlockState createBlockState(){ - return new BlockState(this, PosUtil.META); + return this.getMetaProperty() == null ? super.createBlockState() : new BlockState(this, this.getMetaProperty()); } @Override public IBlockState getStateFromMeta(int meta){ - return getDefaultState().withProperty(PosUtil.META, meta); + return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); } @Override public int getMetaFromState(IBlockState state){ - return state.getValue(PosUtil.META); + return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty()); + } + + protected PropertyInteger getMetaProperty(){ + return null; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index 34a7de202..2fe64985b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -30,14 +30,12 @@ public class BlockPlant extends BlockCrops{ public Item seedItem; public Item returnItem; public int returnMeta; - private int stages; private String name; private int minDropAmount; private int addDropAmount; - public BlockPlant(String name, int stages, int minDropAmount, int addDropAmount){ + public BlockPlant(String name, int minDropAmount, int addDropAmount){ this.name = name; - this.stages = stages; this.minDropAmount = minDropAmount; this.addDropAmount = addDropAmount; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java index 1c23efebf..a24babb8f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java @@ -23,12 +23,12 @@ public class RenderInventory{ /*@Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer){ - GL11.glPushMatrix(); + GlStateManager.glPushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(this.tileRender.resLoc); - GL11.glTranslatef(0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.glTranslatef(0F, 1F, 0F); + GlStateManager.glRotatef(180F, 1F, 0F, 0F); this.tileRender.theModel.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.glPopMatrix(); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java index 7772c5bbd..1df707eaf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java @@ -12,8 +12,8 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; import de.ellpeck.actuallyadditions.mod.util.PosUtil; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.tileentity.TileEntity; -import org.lwjgl.opengl.GL11; public class RenderLaserRelay extends RenderTileEntity{ @@ -24,38 +24,38 @@ public class RenderLaserRelay extends RenderTileEntity{ @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -2.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -2.0F, 0.0F); this.bindTexture(resLoc); int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); if(meta == 0){ - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(0F, -2F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(0F, -2F, 0F); } else if(meta == 3){ - GL11.glRotatef(-90, 1F, 0F, 0F); - GL11.glTranslatef(0F, -1F, 1F); + GlStateManager.rotate(-90, 1F, 0F, 0F); + GlStateManager.translate(0F, -1F, 1F); } else if(meta == 2){ - GL11.glRotatef(90, 1F, 0F, 0F); - GL11.glTranslatef(0F, -1F, -1F); + GlStateManager.rotate(90, 1F, 0F, 0F); + GlStateManager.translate(0F, -1F, -1F); } else if(meta == 4){ - GL11.glRotatef(90, 0F, 0F, 1F); - GL11.glTranslatef(1F, -1F, 0F); + GlStateManager.rotate(90, 0F, 0F, 1F); + GlStateManager.translate(1F, -1F, 0F); } else if(meta == 5){ - GL11.glRotatef(90, 0F, 0F, -1F); - GL11.glTranslatef(-1F, -1F, 0F); + GlStateManager.rotate(90, 0F, 0F, -1F); + GlStateManager.translate(-1F, -1F, 0F); } - GL11.glScalef(0.85F, 0.85F, 0.85F); - GL11.glTranslatef(0F, 0.2657F, 0F); + GlStateManager.scale(0.85F, 0.85F, 0.85F); + GlStateManager.translate(0F, 0.2657F, 0F); theModel.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java index bc22f0397..92b0645a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java @@ -15,10 +15,10 @@ import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import org.lwjgl.opengl.GL11; public class RenderReconstructorLens extends TileEntitySpecialRenderer{ @@ -30,48 +30,48 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{ ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0); if(stack != null && stack.getItem() instanceof ILensItem){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); if(meta == 0){ - GL11.glTranslatef(0F, -0.5F, 0F); - GL11.glTranslatef(-0.25F, 0F, -0.25F); - GL11.glRotatef(90F, 1F, 0F, 0F); + GlStateManager.translate(0F, -0.5F, 0F); + GlStateManager.translate(-0.25F, 0F, -0.25F); + GlStateManager.rotate(90F, 1F, 0F, 0F); } if(meta == 1){ - GL11.glTranslatef(0F, -1.5F-0.5F/16F, 0F); - GL11.glTranslatef(-0.25F, 0F, -0.25F); - GL11.glRotatef(90F, 1F, 0F, 0F); + GlStateManager.translate(0F, -1.5F-0.5F/16F, 0F); + GlStateManager.translate(-0.25F, 0F, -0.25F); + GlStateManager.rotate(90F, 1F, 0F, 0F); } if(meta == 2){ - GL11.glTranslatef(0F, -1F, 0F); - GL11.glTranslatef(0F, 0F, -0.5F); - GL11.glTranslatef(-0.25F, -0.25F, 0F); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.translate(0F, 0F, -0.5F); + GlStateManager.translate(-0.25F, -0.25F, 0F); } if(meta == 3){ - GL11.glTranslatef(0F, -1F, 0F); - GL11.glTranslatef(0F, 0F, 0.5F+0.5F/16F); - GL11.glTranslatef(-0.25F, -0.25F, 0F); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.translate(0F, 0F, 0.5F+0.5F/16F); + GlStateManager.translate(-0.25F, -0.25F, 0F); } if(meta == 4){ - GL11.glTranslatef(0F, -1F, 0F); - GL11.glTranslatef(0.5F+0.5F/16F, 0F, 0F); - GL11.glTranslatef(0F, -0.25F, 0.25F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.translate(0.5F+0.5F/16F, 0F, 0F); + GlStateManager.translate(0F, -0.25F, 0.25F); + GlStateManager.rotate(90F, 0F, 1F, 0F); } if(meta == 5){ - GL11.glTranslatef(0F, -1F, 0F); - GL11.glTranslatef(-0.5F, 0F, 0F); - GL11.glTranslatef(0F, -0.25F, 0.25F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.translate(-0.5F, 0F, 0F); + GlStateManager.translate(0F, -0.25F, 0.25F); + GlStateManager.rotate(90F, 0F, 1F, 0F); } - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); AssetUtil.renderItemInWorld(stack, 0); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java index 7181ce7a5..180784f49 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java @@ -19,10 +19,9 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; public class RenderSmileyCloud extends RenderTileEntity{ @@ -39,7 +38,7 @@ public class RenderSmileyCloud extends RenderTileEntity{ } TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); { if(theCloud.flyHeight == 0){ theCloud.flyHeight = tile.getWorld().rand.nextInt(30)+30; @@ -53,28 +52,28 @@ public class RenderSmileyCloud extends RenderTileEntity{ } if(time-(bobHeight/2) >= theCloud.lastFlyHeight){ - GL11.glTranslated(0, (time-theCloud.lastFlyHeight)/300, 0); + GlStateManager.translate(0, (time-theCloud.lastFlyHeight)/300, 0); } else{ - GL11.glTranslated(0, -(time-theCloud.lastFlyHeight)/300+(double)bobHeight/300, 0); + GlStateManager.translate(0, -(time-theCloud.lastFlyHeight)/300+(double)bobHeight/300, 0); } - GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -2F, 0.0F); + GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -2F, 0.0F); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); { if(theModel.doesRotate()){ int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); if(meta == 0){ - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 0F, 1F, 0F); } if(meta == 1){ - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); } if(meta == 3){ - GL11.glRotatef(270F, 0F, 1F, 0F); + GlStateManager.rotate(270F, 0F, 1F, 0F); } } @@ -103,28 +102,28 @@ public class RenderSmileyCloud extends RenderTileEntity{ } } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(theCloud.name != null && !theCloud.name.isEmpty() && !Minecraft.getMinecraft().gameSettings.hideGUI){ - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); { - GL11.glTranslatef(0F, 0.1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.rotate(180F, 0F, 1F, 0F); - GL11.glRotatef(-Minecraft.getMinecraft().getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(Minecraft.getMinecraft().getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(-Minecraft.getMinecraft().getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(Minecraft.getMinecraft().getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; float f1 = 0.016666668F*f; - GL11.glScalef(-f1, -f1, f1); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glTranslatef(0.0F, 0F/f1, 0.0F); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.scale(-f1, -f1, f1); + GlStateManager.disableLighting(); + GlStateManager.translate(0.0F, 0F/f1, 0.0F); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); //TODO Fix nameplate with Smiley Cloud /*Tessellator tessellator = Tessellator.getInstance(); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.glDisable(GlStateManager.GL_TEXTURE_2D); tessellator.startDrawingQuads(); int i = Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2; tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); @@ -133,20 +132,20 @@ public class RenderSmileyCloud extends RenderTileEntity{ tessellator.addVertex(i+1, 8.0D, 0.0D); tessellator.addVertex(i+1, -1.0D, 0.0D); tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D);*/ - GL11.glDepthMask(true); + GlStateManager.glEnable(GlStateManager.GL_TEXTURE_2D);*/ + GlStateManager.depthMask(true); Minecraft.getMinecraft().fontRendererObj.drawString(theCloud.name, -Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2, 0, StringUtil.DECIMAL_COLOR_WHITE); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glScalef(1F/-f1, 1F/-f1, 1F/f1); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.scale(1F/-f1, 1F/-f1, 1F/f1); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java index 1d4212aa9..fa0e46756 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java @@ -13,10 +13,10 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; public class RenderTileEntity extends TileEntitySpecialRenderer{ @@ -30,29 +30,29 @@ public class RenderTileEntity extends TileEntitySpecialRenderer{ @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int i){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -2.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -2.0F, 0.0F); this.bindTexture(resLoc); if(theModel.doesRotate()){ int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); if(meta == 0){ - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 0F, 1F, 0F); } if(meta == 1){ - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); } if(meta == 3){ - GL11.glRotatef(270F, 0F, 1F, 0F); + GlStateManager.rotate(270F, 0F, 1F, 0F); } } theModel.render(0.0625F); theModel.renderExtra(0.0625F, tile); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java index c47e49adb..9804bf28d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java @@ -14,9 +14,9 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import org.lwjgl.opengl.GL11; public class ModelCompost extends ModelBaseAA{ @@ -76,7 +76,7 @@ public class ModelCompost extends ModelBaseAA{ public void renderExtra(float f, TileEntity tile){ //Hehe if("ShadowfactsDev".equals(Minecraft.getMinecraft().thePlayer.getName())){ - GL11.glTranslatef(0F, 1F, 0F); + GlStateManager.translate(0F, 1F, 0F); } if(tile instanceof TileEntityCompost){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java index 520ddcfd3..d44cce4ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; /** @@ -153,8 +154,8 @@ public class ModelLaserRelay extends ModelBaseAA{ @Override public void render(float f){ - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); bottom.render(f); laserPillar.render(f); laserBase.render(f); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java index 571fc71a1..82e10c8a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java @@ -11,7 +11,6 @@ package de.ellpeck.actuallyadditions.mod.booklet; import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; @@ -24,12 +23,12 @@ public class GuiAAAchievements extends GuiAchievements{ public GuiAAAchievements(GuiScreen screen, StatFileWriter writer){ super(screen, writer); - ReflectionHelper.setPrivateValue(GuiAchievements.class, this, InitAchievements.pageNumber, 21); + ReflectionHelper.setPrivateValue(GuiAchievements.class, this, InitAchievements.pageNumber, 20); } @Override public void initGui(){ super.initGui(); - ((GuiButton)buttonList.get(1)).displayString = InitAchievements.theAchievementPage.getName(); + this.buttonList.get(1).displayString = InitAchievements.theAchievementPage.getName(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index 0b0305463..3b79372c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -32,6 +32,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; @@ -40,7 +41,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; import java.io.IOException; import java.util.ArrayList; @@ -118,10 +118,10 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ //So don't fuck with everything unintentionally // //(This fixes your fuckery) - GL11.glScalef(1.0F, 1.0F, 1.0F); + GlStateManager.scale(1.0F, 1.0F, 1.0F); //Draws the Background - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(ClientProxy.jingleAllTheWay ? resLocChristmas : (ClientProxy.pumpkinBlurPumpkinBlur ? resLocHalloween : (ClientProxy.bulletForMyValentine ? resLocValentine : resLoc))); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java index bdbf2c783..8107e6119 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java @@ -18,10 +18,9 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.KeyUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; @@ -57,24 +56,24 @@ public class BookmarkButton extends GuiButton{ public void drawButton(Minecraft minecraft, int x, int y){ if(this.visible){ minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; int k = this.getHoverState(this.hovered); if(k == 0){ k = 1; } - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.blendFunc(770, 771); int renderHeight = 25; this.drawTexturedModalRect(this.xPosition, this.yPosition, 146+(this.assignedEntry.entry == null ? 0 : 16), 194-renderHeight+k*renderHeight, this.width, renderHeight); this.mouseDragged(minecraft, x, y); if(this.assignedEntry.entry != null){ - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); AssetUtil.renderStackToGui(this.assignedEntry.chapter != null && this.assignedEntry.chapter.getDisplayItemStack() != null ? this.assignedEntry.chapter.getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), this.xPosition+2, this.yPosition+1, 0.725F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java index 1a3566f20..0767fd902 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java @@ -15,8 +15,7 @@ import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; public class IndexButton extends GuiButton{ @@ -31,27 +30,27 @@ public class IndexButton extends GuiButton{ @Override public void drawButton(Minecraft minecraft, int mouseX, int mouseY){ if(this.visible){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition+this.width && mouseY < this.yPosition+this.height; - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.blendFunc(770, 771); this.mouseDragged(minecraft, mouseX, mouseY); int textOffsetX = 0; if(this.chap != null){ if(this.chap.getDisplayItemStack() != null){ - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); AssetUtil.renderStackToGui(this.chap.getDisplayItemStack(), this.xPosition-4, this.yPosition, 0.725F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); textOffsetX = 10; } } if(this.hovered){ - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); AssetUtil.drawHorizontalGradientRect(this.xPosition+textOffsetX-1, this.yPosition+this.height-1, this.xPosition+this.gui.getFontRenderer().getStringWidth(this.displayString)+textOffsetX+1, this.yPosition+this.height, 0x80 << 24 | 22271, 22271, this.zLevel); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } this.gui.getFontRenderer().drawString(this.displayString, this.xPosition+textOffsetX, this.yPosition+(this.height-8)/2, 0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java index 6a19b422a..b185df808 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java @@ -13,8 +13,7 @@ package de.ellpeck.actuallyadditions.mod.booklet.button; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; import java.util.ArrayList; import java.util.List; @@ -47,16 +46,16 @@ public class TexturedButton extends GuiButton{ public void drawButton(Minecraft minecraft, int x, int y){ if(this.visible){ minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; int k = this.getHoverState(this.hovered); if(k == 0){ k = 1; } - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.blendFunc(770, 771); this.drawTexturedModalRect(this.xPosition, this.yPosition, this.texturePosX, this.texturePosY-this.height+k*this.height, this.width, this.height); this.mouseDragged(minecraft, x, y); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java index a55d44217..359e4e2d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java @@ -51,7 +51,7 @@ public class HudEvent{ } } - if(posHit != null){ + if(posHit != null && posHit.getBlockPos() != null){ Block blockHit = PosUtil.getBlock(posHit.getBlockPos(), minecraft.theWorld); TileEntity tileHit = minecraft.theWorld.getTileEntity(posHit.getBlockPos()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index d8d11cbf9..413ff5cb3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiBreaker extends GuiContainer{ @@ -46,7 +46,7 @@ public class GuiBreaker extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index 70f2674da..8594f6447 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -16,11 +16,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -58,7 +58,7 @@ public class GuiCanolaPress extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 0a99e1521..a0d541a9d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -52,7 +52,7 @@ public class GuiCoalGenerator extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index 7e43650ee..9991570ec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -21,12 +21,12 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -86,7 +86,7 @@ public class GuiCoffeeMachine extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java index 94a5a3cf5..e66956e1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java @@ -14,11 +14,11 @@ import de.ellpeck.actuallyadditions.mod.inventory.ContainerCrafter; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiCrafter extends GuiContainer{ @@ -39,7 +39,7 @@ public class GuiCrafter extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index 38ce8c9d8..f3dacb552 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -53,7 +53,7 @@ public class GuiDirectionalBreaker extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 1b54f1b7f..fce51af26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -14,11 +14,11 @@ import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiDrill extends GuiContainer{ @@ -38,7 +38,7 @@ public class GuiDrill extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+54, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index 01dd3340e..a015c2eef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiDropper extends GuiContainer{ @@ -46,7 +46,7 @@ public class GuiDropper extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index 6e3b08246..57e370a46 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -52,7 +52,7 @@ public class GuiEnergizer extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index 18bc7a47c..866c82aa0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -52,7 +52,7 @@ public class GuiEnervator extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index b37f9943a..7e60a3795 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -17,11 +17,11 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Arrays; @@ -54,7 +54,7 @@ public class GuiFeeder extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+70, 0, 0, 176, 86); this.mc.getTextureManager().bindTexture(resLoc); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index dedf85855..543f88437 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -16,11 +16,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -59,7 +59,7 @@ public class GuiFermentingBarrel extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index e8149e7cd..bf3aedf77 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -16,11 +16,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -54,7 +54,7 @@ public class GuiFluidCollector extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 239c8e7db..a821f0a28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -52,7 +52,7 @@ public class GuiFurnaceDouble extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index 15a04b4e5..87acd5918 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiGiantChest extends GuiContainer{ @@ -43,7 +43,7 @@ public class GuiGiantChest extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 242, 190); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index 71479c992..e6436a084 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -59,7 +59,7 @@ public class GuiGrinder extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index 0894a035e..ba72bc1ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -23,7 +23,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; @@ -31,7 +31,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; import java.io.IOException; import java.util.ArrayList; @@ -165,7 +164,7 @@ public class GuiInputter extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93+(isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); @@ -282,12 +281,12 @@ public class GuiInputter extends GuiContainer{ public void drawButton(Minecraft mc, int x, int y){ if(this.visible){ mc.getTextureManager().bindTexture(resLoc); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; int k = this.getHoverState(this.hovered); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.blendFunc(770, 771); this.drawTexturedModalRect(this.xPosition, this.yPosition, 176, k*16, 16, 16); this.mouseDragged(mc, x, y); @@ -319,12 +318,12 @@ public class GuiInputter extends GuiContainer{ public void drawButton(Minecraft mc, int x, int y){ if(this.visible){ mc.getTextureManager().bindTexture(resLoc); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; int k = this.getHoverState(this.hovered); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.blendFunc(770, 771); this.drawTexturedModalRect(this.xPosition, this.yPosition, 192, k*8, 8, 8); this.mouseDragged(mc, x, y); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index 84df01c20..f3ab98257 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -20,11 +20,11 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiMiner extends GuiContainer{ @@ -63,7 +63,7 @@ public class GuiMiner extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index 70f8657e4..93dee8c80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -16,11 +16,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -57,7 +57,7 @@ public class GuiOilGenerator extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index 2e0b64395..58b2a48ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiPhantomPlacer extends GuiContainer{ @@ -46,7 +46,7 @@ public class GuiPhantomPlacer extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index c23db71ec..feb847d8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -21,12 +21,12 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -83,7 +83,7 @@ public class GuiRangedCollector extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+86, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index c6d823914..6af9383b3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -15,11 +15,11 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -52,7 +52,7 @@ public class GuiRepairer extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index 0bbb47a59..3ec364c7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -21,13 +21,13 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; import java.io.IOException; @@ -82,7 +82,7 @@ public class GuiSmileyCloud extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index 02b7a52f9..ef38f3511 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -20,12 +20,12 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiXPSolidifier extends GuiContainer{ @@ -86,7 +86,7 @@ public class GuiXPSolidifier extends GuiContainer{ @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); this.drawTexturedModalRect(this.guiLeft, this.guiTop+93, 0, 0, 176, 86); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java index b7176bb7c..a9d33c467 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java @@ -16,10 +16,10 @@ import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; @@ -377,30 +377,30 @@ public class SmileyCloudEasterEggs{ } private static void renderHoldingItem(boolean leftHand, ItemStack stack){ - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(270F, 0F, 1F, 0F); - GL11.glTranslatef(0F, -1.5F, 0F); - GL11.glTranslatef(-0.5F, 0.2F, leftHand ? 0.55F : -0.5F); - GL11.glScalef(0.75F, 0.75F, 0.75F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(270F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1.5F, 0F); + GlStateManager.translate(-0.5F, 0.2F, leftHand ? 0.55F : -0.5F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); AssetUtil.renderItemInWorld(stack, 0); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private static void renderHeadBlock(Block block, int meta, float rotation){ - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glTranslatef(-0.015F, 0.6F, 0.075F); - GL11.glScalef(0.3F, 0.3F, 0.3F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glRotatef(rotation, 0F, 1F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.translate(-0.015F, 0.6F, 0.075F); + GlStateManager.scale(0.3F, 0.3F, 0.3F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.rotate(rotation, 0F, 1F, 0F); AssetUtil.renderBlockInWorld(block, meta); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.enableLighting(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java index aca9ab153..c22f3a5e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java @@ -14,12 +14,12 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.util.Calendar; @@ -55,33 +55,33 @@ public class RenderSpecial{ this.lastTimeForBobbing = time; } - GL11.glPushMatrix(); - GL11.glTranslated(0D, -0.775D+offsetUp, 0D); - GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F); - GL11.glScalef(size, size, size); + GlStateManager.pushMatrix(); + GlStateManager.translate(0D, -0.775D+offsetUp, 0D); + GlStateManager.rotate(180F, 1.0F, 0.0F, 1.0F); + GlStateManager.scale(size, size, size); if(time-(bobHeight/2) >= lastTimeForBobbing){ - GL11.glTranslated(0, (time-this.lastTimeForBobbing)/100, 0); + GlStateManager.translate(0, (time-this.lastTimeForBobbing)/100, 0); } else{ - GL11.glTranslated(0, -(time-lastTimeForBobbing)/100+bobHeight/100, 0); + GlStateManager.translate(0, -(time-lastTimeForBobbing)/100+bobHeight/100, 0); } - GL11.glRotated(theTime/20, 0, 1, 0); + GlStateManager.rotate((float)(theTime/20), 0, 1, 0); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); if(this.theThingToRender != null){ if(isBlock){ AssetUtil.renderBlockInWorld(Block.getBlockFromItem(this.theThingToRender.getItem()), this.theThingToRender.getItemDamage()); } else{ - GL11.glTranslatef(-0.5F, 0F, 0F); + GlStateManager.translate(-0.5F, 0F, 0F); AssetUtil.renderItemInWorld(this.theThingToRender, 0); } } - GL11.glEnable(GL11.GL_LIGHTING); + GlStateManager.enableLighting(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java index e17ccb256..cbf3493e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java @@ -25,9 +25,9 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.ArrayList; @@ -136,8 +136,8 @@ public class NEIBookletRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void drawForeground(int recipe){ - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableLighting(); this.drawExtras(recipe); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java index 133696079..582721ddc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java @@ -30,8 +30,8 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.ArrayList; @@ -128,7 +128,7 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 126, 88); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java index 8f7c2c73f..db1abbd42 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java @@ -25,8 +25,8 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.Collections; @@ -98,7 +98,7 @@ public class NEICompostRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java index 6ad70313f..4bb30a127 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java @@ -25,8 +25,8 @@ import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.ArrayList; @@ -104,7 +104,7 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(60, 13, 60, 13, 56, 79); } @@ -163,7 +163,7 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(33, 20, 33, 20, 110, 70); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java index 1335f96bd..6251087af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java @@ -23,9 +23,9 @@ import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.Collections; @@ -111,7 +111,7 @@ public class NEIFurnaceDoubleRecipe extends TemplateRecipeHandler implements INE @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(46, 20, 46, 20, 84, 70); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java index e84b69572..f77fc5656 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java @@ -24,8 +24,8 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.Collections; @@ -118,7 +118,7 @@ public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRec @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java index f009a0a1d..0174ff111 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java @@ -26,9 +26,9 @@ import de.ellpeck.actuallyadditions.mod.util.*; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.ArrayList; @@ -144,7 +144,7 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java index 2dbbf913a..f6c90cfce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java @@ -24,8 +24,8 @@ import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.Collections; @@ -116,7 +116,7 @@ public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INE @Override public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java index 93bd094e4..4018ccf7f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -69,7 +69,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr int meta = PosUtil.getMetadata(theCoord, worldObj); this.worldObj.playAuxSFX(2001, theCoord, Block.getIdFromBlock(theBlock)+(meta << 12)); - this.worldObj.setBlockToAir(this.getPos()); + this.worldObj.setBlockToAir(theCoord); this.storage.receiveEnergy(ENERGY_PRODUCED, false); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 5b15b161a..a448d5ed0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -24,7 +24,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; public class AssetUtil{ @@ -74,14 +73,14 @@ public class AssetUtil{ @SideOnly(Side.CLIENT) public static void renderStackToGui(ItemStack stack, int x, int y, float scale){ - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glTranslated(x, y, 0); - GL11.glScalef(scale, scale, scale); + GlStateManager.enableDepth(); + GlStateManager.enableRescaleNormal(); + GlStateManager.translate(x, y, 0); + GlStateManager.scale(scale, scale, scale); Minecraft mc = Minecraft.getMinecraft(); boolean flagBefore = mc.fontRendererObj.getUnicodeFlag(); @@ -94,7 +93,7 @@ public class AssetUtil{ if(mc.currentScreen instanceof GuiBooklet || mc.currentScreen == null){ RenderHelper.disableStandardItemLighting(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } //Copied from Gui.class and changed @@ -115,10 +114,10 @@ public class AssetUtil{ Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - worldrenderer.pos((double)right, (double)top, (double)zLevel).color(f1, f2, f3, f).endVertex(); worldrenderer.pos((double)left, (double)top, (double)zLevel).color(f1, f2, f3, f).endVertex(); - worldrenderer.pos((double)left, (double)bottom, (double)zLevel).color(f5, f6, f7, f4).endVertex(); + worldrenderer.pos((double)left, (double)bottom, (double)zLevel).color(f1, f2, f3, f).endVertex(); worldrenderer.pos((double)right, (double)bottom, (double)zLevel).color(f5, f6, f7, f4).endVertex(); + worldrenderer.pos((double)right, (double)top, (double)zLevel).color(f5, f6, f7, f4).endVertex(); tessellator.draw(); GlStateManager.shadeModel(7424); GlStateManager.disableBlend(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java index d9bcdfbde..2e97727b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockPos; @@ -22,10 +22,14 @@ import net.minecraft.world.World; public class PosUtil{ - public static final PropertyInteger META = PropertyInteger.create("meta", 0, 15); - public static Block getBlock(BlockPos pos, IBlockAccess world){ - return world.getBlockState(pos).getBlock(); + if(pos != null){ + IBlockState state = world.getBlockState(pos); + if(state != null){ + return state.getBlock(); + } + } + return null; } public static Material getMaterial(BlockPos pos, IBlockAccess world){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index dbda94332..73ddb426c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -55,12 +55,12 @@ public class WorldUtil{ } public static void pushEnergyToAllSides(World world, BlockPos pos, EnergyStorage storage){ - WorldUtil.pushEnergy(world, pos, EnumFacing.UP, storage); - WorldUtil.pushEnergy(world, pos, EnumFacing.DOWN, storage); - WorldUtil.pushEnergy(world, pos, EnumFacing.NORTH, storage); - WorldUtil.pushEnergy(world, pos, EnumFacing.EAST, storage); - WorldUtil.pushEnergy(world, pos, EnumFacing.SOUTH, storage); - WorldUtil.pushEnergy(world, pos, EnumFacing.WEST, storage); + pushEnergy(world, pos, EnumFacing.UP, storage); + pushEnergy(world, pos, EnumFacing.DOWN, storage); + pushEnergy(world, pos, EnumFacing.NORTH, storage); + pushEnergy(world, pos, EnumFacing.EAST, storage); + pushEnergy(world, pos, EnumFacing.SOUTH, storage); + pushEnergy(world, pos, EnumFacing.WEST, storage); } public static void pushEnergy(World world, BlockPos pos, EnumFacing side, EnergyStorage storage){ @@ -76,7 +76,7 @@ public class WorldUtil{ public static TileEntity getTileEntityFromSide(EnumFacing side, World world, BlockPos pos){ BlockPos c = getCoordsFromSide(side, pos, 0); if(c != null){ - return world.getTileEntity(pos); + return world.getTileEntity(c); } return null; } @@ -399,7 +399,7 @@ public class WorldUtil{ else{ //Check the Server if a Block that changed on the Client really changed, if not, revert the change //TODO Check if this is the right action - Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit)); + Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit)); } return removed; }