Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Finally updated all the mappings

Browse source
This commit is contained in:
Ellpeck 2016-11-26 21:32:27 +01:00
parent f469f77f4f
commit adad967c02
191 changed files with 602 additions and 721 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -23,10 +23,10 @@ if(hasProperty('buildnumber')){
}
minecraft {
version = "1.11-13.19.0.2154"
version = "1.11-13.19.0.2160"
runDir = "idea"
mappings = "snapshot_20161111"
mappings = "snapshot_20161126"
makeObfSourceJar = false
//useDepAts = true
@ -45,7 +45,7 @@ repositories {
dependencies {
compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51"
deobfCompile "mezz.jei:jei_1.11:4.0.2.194"
deobfCompile "mezz.jei:jei_1.11:4.0.4.198"
}
processResources {

2
src/main/java/de/ellpeck/actuallyadditions/api/recipe/OilGenRecipe.java
View file

@ -10,8 +10,6 @@
package de.ellpeck.actuallyadditions.api.recipe;
import net.minecraftforge.fluids.FluidStack;
public class OilGenRecipe{
public final String fluidName;

2
src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
View file

@ -21,8 +21,8 @@ import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting;
import de.ellpeck.actuallyadditions.mod.entity.InitEntities;
import de.ellpeck.actuallyadditions.mod.event.CommonEvents;
import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager;
import de.ellpeck.actuallyadditions.mod.gen.OreGen;
import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager;
import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;

13
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java
View file

@ -18,9 +18,10 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.*;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@ -113,7 +114,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile instanceof TileEntityAtomicReconstructor){
ItemStack slot = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0);
String strg;
@ -141,7 +142,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);
@ -201,8 +202,8 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
if(this.lastSysTime+3000 < sysTime){
this.lastSysTime = sysTime;
this.toPick1 = player.worldObj.rand.nextInt(NAME_FLAVOR_AMOUNTS_1)+1;
this.toPick2 = player.worldObj.rand.nextInt(NAME_FLAVOR_AMOUNTS_2)+1;
this.toPick1 = player.world.rand.nextInt(NAME_FLAVOR_AMOUNTS_1)+1;
this.toPick2 = player.world.rand.nextInt(NAME_FLAVOR_AMOUNTS_2)+1;
}
String base = "tile."+ModUtil.MOD_ID+"."+((BlockAtomicReconstructor)this.block).getBaseName()+".info.";

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java
View file

@ -17,10 +17,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlacer;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -76,7 +74,7 @@ public class BlockBreaker extends BlockContainerBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
View file

@ -15,11 +15,9 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -29,7 +27,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
View file

@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -95,7 +94,7 @@ public class BlockCoffeeMachine extends BlockContainerBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
int rotation = MathHelper.floor((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
if(rotation == 0){
world.setBlockState(pos, this.getStateFromMeta(0), 2);

8
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -15,14 +15,12 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -40,7 +38,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
import java.util.List;
import java.util.Random;
public class BlockColoredLamp extends BlockBase{
@ -103,11 +100,6 @@ public class BlockColoredLamp extends BlockBase{
return false;
}
@Override
public ItemStack createStackedBlock(IBlockState state){
return new ItemStack(InitBlocks.blockColoredLamp, 1, this.getMetaFromState(state));
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
View file

@ -160,7 +160,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile instanceof TileEntityCompost){
ItemStack slot = ((TileEntityCompost)tile).getStackInSlot(0);
String strg;

7
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
View file

@ -16,25 +16,18 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Mirror;
import net.minecraft.util.NonNullList;
import net.minecraft.util.Rotation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class BlockCrystal extends BlockBase{
public static final TheCrystals[] ALL_CRYSTALS = TheCrystals.values();

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java
View file

@ -16,10 +16,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -72,7 +70,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDistributorItem.java
View file

@ -54,7 +54,7 @@ public class BlockDistributorItem extends BlockContainerBase implements IHudDisp
@Override
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile instanceof TileEntityDistributorItem){
TileEntityDistributorItem distributor = (TileEntityDistributorItem)tile;
ItemStack slot = distributor.getStackInSlot(0);

5
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java
View file

@ -15,11 +15,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -72,7 +69,7 @@ public class BlockDropper extends BlockContainerBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java
View file

@ -17,8 +17,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -31,7 +29,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.Mirror;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
public class BlockFarmer extends BlockContainerBase{

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java
View file

@ -17,10 +17,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidPlacer;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -78,7 +76,7 @@ public class BlockFluidCollector extends BlockContainerBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
View file

@ -15,10 +15,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -55,7 +53,7 @@ public class BlockLampPowerer extends BlockBase{
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
super.onBlockPlacedBy(world, pos, state, player, stack);

9
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
View file

@ -19,10 +19,8 @@ import de.ellpeck.actuallyadditions.mod.tile.*;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@ -122,9 +120,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
return false;
}
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
return this.getStateFromMeta(side.ordinal());
}
@ -214,8 +211,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
if(posHit != null && posHit.getBlockPos() != null && minecraft.theWorld != null){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
if(posHit != null && posHit.getBlockPos() != null && minecraft.world != null){
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile instanceof TileEntityLaserRelayItem){
TileEntityLaserRelayItem relay = (TileEntityLaserRelayItem)tile;

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
View file

@ -51,7 +51,7 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IH
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntityLavaFactoryController factory = (TileEntityLavaFactoryController)minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntityLavaFactoryController factory = (TileEntityLavaFactoryController)minecraft.world.getTileEntity(posHit.getBlockPos());
if(factory != null){
int state = factory.isMultiblock();
if(state == TileEntityLavaFactoryController.NOT_MULTI){

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java
View file

@ -79,7 +79,7 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile instanceof TileEntityMiner){
String info = ((TileEntityMiner)tile).layerAt <= 0 ? "Done Mining!" : "Mining at Y = "+((TileEntityMiner)tile).layerAt+".";
minecraft.fontRendererObj.drawStringWithShadow(info, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-20, StringUtil.DECIMAL_COLOR_WHITE);

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
View file

@ -14,12 +14,10 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -30,8 +28,6 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class BlockMisc extends BlockBase{
public static final TheMiscBlocks[] ALL_MISC_BLOCKS = TheMiscBlocks.values();

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
View file

@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -77,7 +76,8 @@ public class BlockOilGenerator extends BlockContainerBase{
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ItemStack stack = player.getHeldItem(hand);
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){
ItemStack stack = player.getHeldItem(hand);
if(!world.isRemote){
TileEntityOilGenerator generator = (TileEntityOilGenerator)world.getTileEntity(pos);
if(generator != null){

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java
View file

@ -127,14 +127,14 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile != null){
if(tile instanceof IPhantomTile){
IPhantomTile phantom = (IPhantomTile)tile;
minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".blockPhantomRange.desc")+": "+phantom.getRange(), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-40, StringUtil.DECIMAL_COLOR_WHITE);
if(phantom.hasBoundPosition()){
int distance = (int)new Vec3d(posHit.getBlockPos()).distanceTo(new Vec3d(phantom.getBoundPosition()));
IBlockState state = minecraft.theWorld.getBlockState(phantom.getBoundPosition());
IBlockState state = minecraft.world.getBlockState(phantom.getBoundPosition());
Block block = state.getBlock();
Item item = Item.getItemFromBlock(block);
String name = item == null ? "Something Unrecognizable" : item.getItemStackDisplayName(new ItemStack(block, 1, block.getMetaFromState(state)));

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java
View file

@ -69,7 +69,7 @@ public class BlockPlayerInterface extends BlockContainerBase implements IHudDisp
@Override
@SideOnly(Side.CLIENT)
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
if(tile != null){
if(tile instanceof TileEntityPlayerInterface){
TileEntityPlayerInterface face = (TileEntityPlayerInterface)tile;

9
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java
View file

@ -14,17 +14,18 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SoundType;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.*;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@ -78,7 +79,7 @@ public class BlockSlabs extends BlockBase{
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
if(facing.ordinal() == 1){
return this.getStateFromMeta(meta);
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java
View file

@ -19,7 +19,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -29,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java
View file

@ -106,7 +106,7 @@ public class BlockTinyTorch extends BlockBase{
}
@Override
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
if(this.canPlaceAt(worldIn, pos, facing)){
return this.getDefaultState().withProperty(BlockTorch.FACING, facing);
}

7
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java
View file

@ -18,7 +18,6 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -90,10 +89,10 @@ public class BlockTreasureChest extends BlockBase{
}
private void dropItems(World world, BlockPos pos){
for(int i = 0; i < MathHelper.getRandomIntegerInRange(world.rand, 3, 6); i++){
for(int i = 0; i < MathHelper.getInt(world.rand, 3, 6); i++){
TreasureChestLoot theReturn = WeightedRandom.getRandomItem(world.rand, ActuallyAdditionsAPI.TREASURE_CHEST_LOOT);
ItemStack itemStack = theReturn.returnItem.copy();
itemStack = StackUtil.setStackSize(itemStack, MathHelper.getRandomIntegerInRange(world.rand, theReturn.minAmount, theReturn.maxAmount));
itemStack = StackUtil.setStackSize(itemStack, MathHelper.getInt(world.rand, theReturn.minAmount, theReturn.maxAmount));
float dX = world.rand.nextFloat()*0.8F+0.1F;
float dY = world.rand.nextFloat()*0.8F+0.1F;
@ -103,7 +102,7 @@ public class BlockTreasureChest extends BlockBase{
entityItem.motionX = world.rand.nextGaussian()*factor;
entityItem.motionY = world.rand.nextGaussian()*factor+0.2F;
entityItem.motionZ = world.rand.nextGaussian()*factor;
world.spawnEntityInWorld(entityItem);
world.spawnEntity(entityItem);
}
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java
View file

@ -26,12 +26,9 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class BlockWallAA extends BlockBase{
protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[]{new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)};

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java
View file

@ -16,13 +16,11 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant;
import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java
View file

@ -18,7 +18,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
import net.minecraft.block.BlockHorizontal;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -31,7 +30,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.Mirror;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
public class BlockXPSolidifier extends BlockContainerBase{

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java
View file

@ -14,9 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java
View file

@ -14,9 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import net.minecraft.block.BlockBush;
import net.minecraft.block.SoundType;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;

5
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
View file

@ -19,8 +19,6 @@ 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.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
@ -34,7 +32,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@ -110,7 +107,7 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
entityItem.motionX = world.rand.nextGaussian()*factor;
entityItem.motionY = world.rand.nextGaussian()*factor+0.2F;
entityItem.motionZ = world.rand.nextGaussian()*factor;
world.spawnEntityInWorld(entityItem);
world.spawnEntity(entityItem);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java
View file

@ -105,7 +105,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit
if(StackUtil.isValid(drop)){
EntityItem entity = new EntityItem(world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, drop);
world.spawnEntityInWorld(entity);
world.spawnEntity(entity);
}
}
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java
View file

@ -39,11 +39,6 @@ public enum TheColoredLampColors implements IStringSerializable{
this.regName = regName;
}
@Override
public String getName(){
return this.regName;
}
public static TheColoredLampColors getColorFromDyeName(String color){
if(color.substring(0, 3).equals("dye")){
String actualName = color.substring(3);
@ -58,4 +53,9 @@ public enum TheColoredLampColors implements IStringSerializable{
}
return null;
}
@Override
public String getName(){
return this.regName;
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java
View file

@ -50,7 +50,7 @@ public class RenderCompost extends TileEntitySpecialRenderer{
GlStateManager.pushMatrix();
GlStateManager.translate((float)x+0.5F, (float)y+(i/3F)+0.01F, (float)z+0.5F);
//Hehe
if("ShadowfactsDev".equals(Minecraft.getMinecraft().thePlayer.getName())){
if("ShadowfactsDev".equals(Minecraft.getMinecraft().player.getName())){
GlStateManager.translate(0F, 1F, 0F);
}
GlStateManager.scale(1.5F, i, 1.5F);

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
View file

@ -56,7 +56,7 @@ public class BookletEntry implements IBookletEntry{
if(!items.isEmpty()){
for(ItemStack stack : items){
if(StackUtil.isValid(stack)){
List<String> tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
List<String> tooltip = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips);
for(String strg : tooltip){
if(strg != null && strg.toLowerCase(Locale.ROOT).contains(searchBarText)){
return true;

6
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java
View file

@ -93,7 +93,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
}
if(this.hasBookmarkButtons()){
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
int xStart = this.guiLeft+this.xSize/2-16*this.bookmarkButtons.length/2;
for(int i = 0; i < this.bookmarkButtons.length; i++){
@ -114,7 +114,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
//Don't cache the parent GUI, otherwise it opens again when you close the cached book!
this.previousScreen = null;
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
boolean change = false;
for(int i = 0; i < this.bookmarkButtons.length; i++){
@ -126,7 +126,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
data.lastOpenBooklet = this;
if(change){
PacketHandlerHelper.sendPlayerDataPacket(this.mc.thePlayer, true, false);
PacketHandlerHelper.sendPlayerDataPacket(this.mc.player, true, false);
}
}

16
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java
View file

@ -77,12 +77,12 @@ public class GuiMainPage extends GuiBooklet{
super.initGui();
int flavor = 1;
if(this.mc.theWorld.rand.nextFloat() <= 0.1){
flavor = MathHelper.getRandomIntegerInRange(this.mc.theWorld.rand, 2, 7);
if(this.mc.world.rand.nextFloat() <= 0.1){
flavor = MathHelper.getInt(this.mc.world.rand, 2, 7);
}
this.bookletName = "info."+ModUtil.MOD_ID+".booklet.manualName.1."+flavor;
String usedQuote = QUOTES[this.mc.theWorld.rand.nextInt(QUOTES.length)];
String usedQuote = QUOTES[this.mc.world.rand.nextInt(QUOTES.length)];
String[] quoteSplit = usedQuote.split("@");
if(quoteSplit.length == 2){
this.quote = this.fontRendererObj.listFormattedStringToWidth(quoteSplit[0], 120);
@ -101,7 +101,7 @@ public class GuiMainPage extends GuiBooklet{
this.achievementButton = new TexturedButton(RES_LOC_GADGETS, -389, this.guiLeft+36, this.guiTop+this.ySize-30, 204, 14, 16, 16, achievementText);
this.buttonList.add(this.achievementButton);
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
if(!data.didBookTutorial){
this.showTutorial = true;
@ -134,7 +134,7 @@ public class GuiMainPage extends GuiBooklet{
}
}
else if(button == this.achievementButton){
GuiScreen achievements = new GuiAAAchievements(this, this.mc.thePlayer.getStatFileWriter());
GuiScreen achievements = new GuiAAAchievements(this, this.mc.player.getStatFileWriter());
this.mc.displayGuiScreen(achievements);
}
else if(button == this.configButton){
@ -154,9 +154,9 @@ public class GuiMainPage extends GuiBooklet{
this.configButton.visible = true;
this.achievementButton.visible = true;
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
data.didBookTutorial = true;
PacketHandlerHelper.sendPlayerDataPacket(this.mc.thePlayer, true, false);
PacketHandlerHelper.sendPlayerDataPacket(this.mc.player, true, false);
}
}
else{
@ -174,7 +174,7 @@ public class GuiMainPage extends GuiBooklet{
this.fontRendererObj.drawString(strg, this.guiLeft+72-this.fontRendererObj.getStringWidth(strg)/2-3, this.guiTop+19+this.fontRendererObj.FONT_HEIGHT, 0);
String versionStrg;
String playerName = Minecraft.getMinecraft().thePlayer.getName();
String playerName = Minecraft.getMinecraft().player.getName();
if(Util.isDevVersion()){
versionStrg = "Dev's Edition";

4
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java
View file

@ -55,6 +55,8 @@ public class GuiAAAchievements extends GuiAchievements{
if(key == Keyboard.KEY_ESCAPE || key == this.mc.gameSettings.keyBindInventory.getKeyCode()){
this.mc.displayGuiScreen(this.parentScreen);
}
else super.keyTyped(typedChar, key);
else{
super.keyTyped(typedChar, key);
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java
View file

@ -58,7 +58,7 @@ public class ItemDisplay{
boolean flagBefore = mc.fontRendererObj.getUnicodeFlag();
mc.fontRendererObj.setUnicodeFlag(false);
List<String> list = this.stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
List<String> list = this.stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips);
for(int k = 0; k < list.size(); ++k){
if(k == 0){

1
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
View file

@ -30,7 +30,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.potion.PotionHelper;
import net.minecraft.potion.PotionUtils;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.common.registry.GameRegistry;

2
src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
View file

@ -24,8 +24,6 @@ import net.minecraftforge.fluids.UniversalBucket;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class CreativeTab extends CreativeTabs{
public static final CreativeTab INSTANCE = new CreativeTab();

2
src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java
View file

@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave;
import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import io.netty.util.internal.ConcurrentSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@ -28,7 +27,6 @@ import net.minecraftforge.common.WorldSpecificSaveHandler;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;

24
src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityWorm.java
View file

@ -65,43 +65,43 @@ public class EntityWorm extends Entity{
@Override
public void onEntityUpdate(){
if(!this.worldObj.isRemote){
if(!this.world.isRemote){
this.timer++;
if(this.timer%50 == 0){
for(int x = -1; x <= 1; x++){
for(int z = -1; z <= 1; z++){
BlockPos pos = new BlockPos(this.posX+x, this.posY, this.posZ+z);
IBlockState state = this.worldObj.getBlockState(pos);
IBlockState state = this.world.getBlockState(pos);
Block block = state.getBlock();
boolean isMiddlePose = x == 0 && z == 0;
if(canWormify(this.worldObj, pos, state)){
if(canWormify(this.world, pos, state)){
boolean isFarmland = block instanceof BlockFarmland;
if(!isFarmland || state.getValue(BlockFarmland.MOISTURE) < 7){
if(isMiddlePose || this.worldObj.rand.nextFloat() >= 0.45F){
if(isMiddlePose || this.world.rand.nextFloat() >= 0.45F){
IBlockState stateToModify = isFarmland ? state : Blocks.FARMLAND.getDefaultState();
this.worldObj.setBlockState(pos, stateToModify.withProperty(BlockFarmland.MOISTURE, 7), 2);
this.world.setBlockState(pos, stateToModify.withProperty(BlockFarmland.MOISTURE, 7), 2);
if(!isFarmland){
this.worldObj.setBlockToAir(pos.up());
this.world.setBlockToAir(pos.up());
}
}
}
if(isFarmland && this.worldObj.rand.nextFloat() >= 0.95F){
if(isFarmland && this.world.rand.nextFloat() >= 0.95F){
BlockPos plant = pos.up();
if(!this.worldObj.isAirBlock(plant)){
IBlockState plantState = this.worldObj.getBlockState(plant);
if(!this.world.isAirBlock(plant)){
IBlockState plantState = this.world.getBlockState(plant);
Block plantBlock = plantState.getBlock();
if((plantBlock instanceof IGrowable || plantBlock instanceof IPlantable) && !(plantBlock instanceof BlockGrass)){
plantBlock.updateTick(this.worldObj, plant, plantState, this.worldObj.rand);
plantBlock.updateTick(this.world, plant, plantState, this.world.rand);
IBlockState newState = this.worldObj.getBlockState(plant);
IBlockState newState = this.world.getBlockState(plant);
if(newState.getBlock().getMetaFromState(newState) != plantBlock.getMetaFromState(plantState)){
this.worldObj.playEvent(2005, plant, 0);
this.world.playEvent(2005, plant, 0);
}
}
}

6
src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java
View file

@ -136,7 +136,7 @@ public class ClientEvents{
public void onGameOverlay(RenderGameOverlayEvent.Post event){
if(event.getType() == RenderGameOverlayEvent.ElementType.ALL && Minecraft.getMinecraft().currentScreen == null){
Minecraft minecraft = Minecraft.getMinecraft();
EntityPlayer player = minecraft.thePlayer;
EntityPlayer player = minecraft.player;
RayTraceResult posHit = minecraft.objectMouseOver;
FontRenderer font = minecraft.fontRendererObj;
ItemStack stack = player.getHeldItemMainhand();
@ -148,8 +148,8 @@ public class ClientEvents{
}
if(posHit != null && posHit.getBlockPos() != null){
Block blockHit = minecraft.theWorld.getBlockState(posHit.getBlockPos()).getBlock();
TileEntity tileHit = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
Block blockHit = minecraft.world.getBlockState(posHit.getBlockPos()).getBlock();
TileEntity tileHit = minecraft.world.getTileEntity(posHit.getBlockPos());
if(blockHit instanceof IHudDisplay){
((IHudDisplay)blockHit).displayHud(minecraft, player, stack, posHit, event.getResolution());

14
src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java
View file

@ -56,11 +56,11 @@ public class CommonEvents{
@SubscribeEvent
public void onEntityDropEvent(LivingDropsEvent event){
if(event.getEntityLiving().worldObj != null && !event.getEntityLiving().worldObj.isRemote && event.getSource().getEntity() instanceof EntityPlayer){
if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getEntity() instanceof EntityPlayer){
//Drop Cobwebs from Spiders
if(ConfigBoolValues.DO_SPIDER_DROPS.isEnabled() && event.getEntityLiving() instanceof EntitySpider){
if(event.getEntityLiving().worldObj.rand.nextInt(20) <= event.getLootingLevel()*2){
event.getEntityLiving().entityDropItem(new ItemStack(Blocks.WEB, event.getEntityLiving().worldObj.rand.nextInt(2+event.getLootingLevel())+1), 0);
if(event.getEntityLiving().world.rand.nextInt(20) <= event.getLootingLevel()*2){
event.getEntityLiving().entityDropItem(new ItemStack(Blocks.WEB, event.getEntityLiving().world.rand.nextInt(2+event.getLootingLevel())+1), 0);
}
}
}
@ -68,7 +68,7 @@ public class CommonEvents{
@SubscribeEvent
public void onLogInEvent(PlayerEvent.PlayerLoggedInEvent event){
if(!event.player.worldObj.isRemote && event.player instanceof EntityPlayerMP){
if(!event.player.world.isRemote && event.player instanceof EntityPlayerMP){
EntityPlayerMP player = (EntityPlayerMP)event.player;
PacketHandlerHelper.sendPlayerDataPacket(player, true, true);
ModUtil.LOGGER.info("Sending Player Data to player "+player.getName()+" with UUID "+player.getUniqueID()+".");
@ -80,7 +80,7 @@ public class CommonEvents{
checkAchievements(event.crafting, event.player, InitAchievements.Type.CRAFTING);
if(ConfigBoolValues.GIVE_BOOKLET_ON_FIRST_CRAFT.isEnabled()){
if(!event.player.worldObj.isRemote && StackUtil.isValid(event.crafting) && event.crafting.getItem() != InitItems.itemBooklet){
if(!event.player.world.isRemote && StackUtil.isValid(event.crafting) && event.crafting.getItem() != InitItems.itemBooklet){
String name = event.crafting.getItem().getRegistryName().toString();
if(name != null && name.toLowerCase(Locale.ROOT).contains(ModUtil.MOD_ID)){
@ -88,9 +88,9 @@ public class CommonEvents{
if(save != null && !save.bookGottenAlready){
save.bookGottenAlready = true;
EntityItem entityItem = new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(InitItems.itemBooklet));
EntityItem entityItem = new EntityItem(event.player.world, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(InitItems.itemBooklet));
entityItem.setPickupDelay(0);
event.player.worldObj.spawnEntityInWorld(entityItem);
event.player.world.spawnEntity(entityItem);
}
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java
View file

@ -67,7 +67,7 @@ public class OreGen implements IWorldGenerator{
private void generateDefault(World world, Random random, int x, int z){
if(ConfigBoolValues.GENERATE_QUARTZ.isEnabled()){
this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.STONE, world, random, x*16, z*16, MathHelper.getRandomIntegerInRange(random, 5, 8), 10, QUARTZ_MIN, QUARTZ_MAX);
this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.STONE, world, random, x*16, z*16, MathHelper.getInt(random, 5, 8), 10, QUARTZ_MIN, QUARTZ_MAX);
}
if(ConfigBoolValues.GEN_LUSH_CAVES.isEnabled()){
@ -81,7 +81,7 @@ public class OreGen implements IWorldGenerator{
Random chunkRand = new Random(randConst ^ world.getSeed() ^ (chunkX*29+chunkZ*31));
if(chunkRand.nextInt(ConfigIntValues.LUSH_CAVE_CHANCE.getValue()) <= 0){
BlockPos randPos = world.getTopSolidOrLiquidBlock(new BlockPos(chunkX*16+chunkRand.nextInt(16)+8, 0, chunkZ*16+chunkRand.nextInt(16)+8));
BlockPos pos = randPos.down(MathHelper.getRandomIntegerInRange(chunkRand, 15, randPos.getY()-15));
BlockPos pos = randPos.down(MathHelper.getInt(chunkRand, 15, randPos.getY()-15));
this.caveGen.generate(world, chunkRand, pos, box);
}
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java
View file

@ -18,7 +18,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
@ -97,7 +96,7 @@ public class WorldGenLushCaves{
trees.generate(world, rand, pos.up());
if(ConfigBoolValues.DUNGEON_LOOT.isEnabled() && !crateGenDone && genCrate){
BlockPos cratePos = pos.add(MathHelper.getRandomIntegerInRange(rand, -2, 2), MathHelper.getRandomIntegerInRange(rand, 3, 8), MathHelper.getRandomIntegerInRange(rand, -2, 2));
BlockPos cratePos = pos.add(MathHelper.getInt(rand, -2, 2), MathHelper.getInt(rand, 3, 8), MathHelper.getInt(rand, -2, 2));
IBlockState state = world.getBlockState(cratePos);
if(state != null && state.getBlock().isLeaves(state, world, cratePos)){

2
src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/BasicTradeList.java
View file

@ -44,7 +44,7 @@ public class BasicTradeList implements ITradeList{
}
@Override
public void func_190888_a(IMerchant merchant, MerchantRecipeList recipeList, Random random){
public void addMerchantRecipe(IMerchant merchant, MerchantRecipeList recipeList, Random random){
ItemStack in = this.input.copy();
in = StackUtil.setStackSize(in, this.inputAmount.getPrice(random));
ItemStack out = this.output.copy();

2
src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/JamVillagerTradeList.java
View file

@ -25,7 +25,7 @@ import java.util.Random;
public class JamVillagerTradeList implements ITradeList{
@Override
public void func_190888_a(IMerchant merchant, MerchantRecipeList recipeList, Random random){
public void addMerchantRecipe(IMerchant merchant, MerchantRecipeList recipeList, Random random){
for(int i = 0; i < random.nextInt(3)+3; i++){
ItemStack jam = new ItemStack(InitItems.itemJams, 1, random.nextInt(TheJams.values().length));
ItemStack emerald = new ItemStack(Items.EMERALD);

2
src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java
View file

@ -99,7 +99,7 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous
}
private IBlockState getRandomCropType(Random rand){
int randomMeta = MathHelper.getRandomIntegerInRange(rand, 1, 7);
int randomMeta = MathHelper.getInt(rand, 1, 7);
switch(rand.nextInt(4)){
case 0:
return InitBlocks.blockFlax.getStateFromMeta(randomMeta);

36
src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java
View file

@ -53,6 +53,24 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{
return canVillageGoDeeper(boundingBox) && StructureComponent.findIntersecting(pieces, boundingBox) == null ? new VillageComponentJamHouse(boundingBox, p4) : null;
}
public static boolean generateCrate(World world, StructureBoundingBox box, int x, int y, int z, ResourceLocation loot){
BlockPos pos = new BlockPos(x, y, z);
if(box.isVecInside(pos)){
world.setBlockState(pos, InitBlocks.blockGiantChest.getDefaultState(), 2);
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileEntityGiantChest){
((TileEntityGiantChest)tile).lootTable = loot;
}
return true;
}
else{
return false;
}
}
@Override
public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){
if(this.averageGroundLevel < 0){
@ -210,22 +228,4 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{
protected VillagerProfession chooseForgeProfession(int count, VillagerProfession prof){
return InitVillager.jamProfession;
}
public static boolean generateCrate(World world, StructureBoundingBox box, int x, int y, int z, ResourceLocation loot){
BlockPos pos = new BlockPos(x, y, z);
if(box.isVecInside(pos)){
world.setBlockState(pos, InitBlocks.blockGiantChest.getDefaultState(), 2);
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileEntityGiantChest){
((TileEntityGiantChest)tile).lootTable = loot;
}
return true;
}
else{
return false;
}
}
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java
View file

@ -29,8 +29,6 @@ import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Arrays;
public class ContainerBag extends Container implements IButtonReactor{
@ -184,7 +182,7 @@ public class ContainerBag extends Container implements IButtonReactor{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -219,7 +217,7 @@ public class ContainerBag extends Container implements IButtonReactor{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.bagInventory.isUseableByPlayer(player);
return this.bagInventory.isUsableByPlayer(player);
}
@Override
@ -256,7 +254,7 @@ public class ContainerBag extends Container implements IButtonReactor{
}
@Override
public boolean isUseableByPlayer(EntityPlayer player){
public boolean isUsableByPlayer(EntityPlayer player){
return true;
}
@ -307,7 +305,7 @@ public class ContainerBag extends Container implements IButtonReactor{
}
@Override
public boolean func_191420_l(){
public boolean isEmpty(){
return StackUtil.isIInvEmpty(this.slots);
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java
View file

@ -88,7 +88,7 @@ public class ContainerBioReactor extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -97,6 +97,6 @@ public class ContainerBioReactor extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tile.isUseableByPlayer(player);
return this.tile.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java
View file

@ -85,7 +85,7 @@ public class ContainerBreaker extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerBreaker extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.breaker.isUseableByPlayer(player);
return this.breaker.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java
View file

@ -87,7 +87,7 @@ public class ContainerCanolaPress extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -96,6 +96,6 @@ public class ContainerCanolaPress extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.press.isUseableByPlayer(player);
return this.press.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java
View file

@ -86,7 +86,7 @@ public class ContainerCoalGenerator extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -95,6 +95,6 @@ public class ContainerCoalGenerator extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.generator.isUseableByPlayer(player);
return this.generator.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
View file

@ -114,7 +114,7 @@ public class ContainerCoffeeMachine extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -123,6 +123,6 @@ public class ContainerCoffeeMachine extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.machine.isUseableByPlayer(player);
return this.machine.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java
View file

@ -29,7 +29,7 @@ public class ContainerCrafter extends Container{
public ContainerCrafter(EntityPlayer player){
InventoryPlayer inventory = player.inventory;
this.world = player.worldObj;
this.world = player.world;
this.addSlotToContainer(new SlotCrafting(inventory.player, this.craftMatrix, this.craftResult, 0, 124, 35));
for(int i = 0; i < 3; i++){
@ -91,7 +91,7 @@ public class ContainerCrafter extends Container{
return StackUtil.getNull();
}
slot.func_190901_a(player, itemstack1);
slot.onTake(player, itemstack1);
}
return itemstack;

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java
View file

@ -85,7 +85,7 @@ public class ContainerDirectionalBreaker extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerDirectionalBreaker extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.breaker.isUseableByPlayer(player);
return this.breaker.isUsableByPlayer(player);
}
}

11
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java
View file

@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable;
import de.ellpeck.actuallyadditions.mod.items.ItemDrill;
import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import de.ellpeck.actuallyadditions.mod.util.compat.TeslaUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ClickType;
@ -26,8 +25,6 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import java.util.Arrays;
public class ContainerDrill extends Container{
@ -114,7 +111,7 @@ public class ContainerDrill extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -142,7 +139,7 @@ public class ContainerDrill extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.drillInventory.isUseableByPlayer(player);
return this.drillInventory.isUsableByPlayer(player);
}
public static class InventoryDrill implements IInventory{
@ -165,7 +162,7 @@ public class ContainerDrill extends Container{
}
@Override
public boolean isUseableByPlayer(EntityPlayer player){
public boolean isUsableByPlayer(EntityPlayer player){
return true;
}
@ -216,7 +213,7 @@ public class ContainerDrill extends Container{
}
@Override
public boolean func_191420_l(){
public boolean isEmpty(){
return StackUtil.isIInvEmpty(this.slots);
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java
View file

@ -85,7 +85,7 @@ public class ContainerDropper extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerDropper extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.dropper.isUseableByPlayer(player);
return this.dropper.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
View file

@ -124,7 +124,7 @@ public class ContainerEnergizer extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -133,6 +133,6 @@ public class ContainerEnergizer extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.energizer.isUseableByPlayer(player);
return this.energizer.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
View file

@ -123,7 +123,7 @@ public class ContainerEnervator extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -132,6 +132,6 @@ public class ContainerEnervator extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.enervator.isUseableByPlayer(player);
return this.enervator.isUsableByPlayer(player);
}
}

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java
View file

@ -18,7 +18,6 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.IPlantable;
public class ContainerFarmer extends Container{
@ -95,7 +94,7 @@ public class ContainerFarmer extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -104,6 +103,6 @@ public class ContainerFarmer extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.farmer.isUseableByPlayer(player);
return this.farmer.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java
View file

@ -80,7 +80,7 @@ public class ContainerFeeder extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -89,6 +89,6 @@ public class ContainerFeeder extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileFeeder.isUseableByPlayer(player);
return this.tileFeeder.isUsableByPlayer(player);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java
View file

@ -75,7 +75,7 @@ public class ContainerFermentingBarrel extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java
View file

@ -26,8 +26,6 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import java.util.Arrays;
public class ContainerFilter extends Container{
@ -105,7 +103,7 @@ public class ContainerFilter extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -137,7 +135,7 @@ public class ContainerFilter extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.filterInventory.isUseableByPlayer(player);
return this.filterInventory.isUsableByPlayer(player);
}
public static class InventoryFilter implements IInventory{
@ -160,7 +158,7 @@ public class ContainerFilter extends Container{
}
@Override
public boolean isUseableByPlayer(EntityPlayer player){
public boolean isUsableByPlayer(EntityPlayer player){
return true;
}
@ -211,7 +209,7 @@ public class ContainerFilter extends Container{
}
@Override
public boolean func_191420_l(){
public boolean isEmpty(){
return StackUtil.isIInvEmpty(this.slots);
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java
View file

@ -82,7 +82,7 @@ public class ContainerFluidCollector extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java
View file

@ -99,7 +99,7 @@ public class ContainerFurnaceDouble extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -108,6 +108,6 @@ public class ContainerFurnaceDouble extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileFurnace.isUseableByPlayer(player);
return this.tileFurnace.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
View file

@ -86,7 +86,7 @@ public class ContainerGiantChest extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -95,6 +95,6 @@ public class ContainerGiantChest extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileChest.isUseableByPlayer(player);
return this.tileChest.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java
View file

@ -110,7 +110,7 @@ public class ContainerGrinder extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -119,6 +119,6 @@ public class ContainerGrinder extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileGrinder.isUseableByPlayer(player);
return this.tileGrinder.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java
View file

@ -97,7 +97,7 @@ public class ContainerInputter extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -117,6 +117,6 @@ public class ContainerInputter extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileInputter.isUseableByPlayer(player);
return this.tileInputter.isUsableByPlayer(player);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java
View file

@ -85,7 +85,7 @@ public class ContainerLaserRelayItemWhitelist extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java
View file

@ -85,7 +85,7 @@ public class ContainerMiner extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerMiner extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.miner.isUseableByPlayer(player);
return this.miner.isUsableByPlayer(player);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java
View file

@ -74,7 +74,7 @@ public class ContainerOilGenerator extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java
View file

@ -85,7 +85,7 @@ public class ContainerPhantomPlacer extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerPhantomPlacer extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.placer.isUseableByPlayer(player);
return this.placer.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java
View file

@ -92,7 +92,7 @@ public class ContainerRangedCollector extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -112,6 +112,6 @@ public class ContainerRangedCollector extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.collector.isUseableByPlayer(player);
return this.collector.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java
View file

@ -87,7 +87,7 @@ public class ContainerRepairer extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -96,6 +96,6 @@ public class ContainerRepairer extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.tileRepairer.isUseableByPlayer(player);
return this.tileRepairer.isUsableByPlayer(player);
}
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java
View file

@ -85,7 +85,7 @@ public class ContainerXPSolidifier extends Container{
if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
return StackUtil.getNull();
}
theSlot.func_190901_a(player, newStack);
theSlot.onTake(player, newStack);
return currentStack;
}
@ -94,6 +94,6 @@ public class ContainerXPSolidifier extends Container{
@Override
public boolean canInteractWith(EntityPlayer player){
return this.solidifier.isUseableByPlayer(player);
return this.solidifier.isUsableByPlayer(player);
}
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java
View file

@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraftforge.fml.client.config.GuiUtils;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -68,7 +67,7 @@ public class EnergyDisplay extends Gui{
if(this.rfReference.getEnergyStored() > 0){
int i = this.rfReference.getEnergyStored()*83/this.rfReference.getMaxEnergyStored();
float[] color = AssetUtil.getWheelColor(mc.theWorld.getTotalWorldTime()%256);
float[] color = AssetUtil.getWheelColor(mc.world.getTotalWorldTime()%256);
GlStateManager.color(color[0]/255F, color[1]/255F, color[2]/255F);
this.drawTexturedModalRect(barX+1, barY+84-i, 36, 172, 16, i);
GlStateManager.color(1F, 1F, 1F);

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java
View file

@ -68,8 +68,8 @@ public class GuiBag extends GuiContainer{
protected void actionPerformed(GuiButton button) throws IOException{
NBTTagCompound data = new NBTTagCompound();
data.setInteger("ButtonID", button.id);
data.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
data.setInteger("WorldID", Minecraft.getMinecraft().theWorld.provider.getDimension());
data.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
data.setInteger("WorldID", Minecraft.getMinecraft().world.provider.getDimension());
PacketHandler.theNetwork.sendToServer(new PacketClientToServer(data, PacketHandler.GUI_BUTTON_TO_CONTAINER_HANDLER));
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java
View file

@ -19,8 +19,6 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import java.io.IOException;
public class GuiBioReactor extends GuiContainer{
private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bio_reactor");

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiCanolaPress extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiCoalGenerator extends GuiContainer{

1
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java
View file

@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
import java.util.Collections;
@SideOnly(Side.CLIENT)

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiDirectionalBreaker extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiEnergizer extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiEnervator extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiFarmer extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java
View file

@ -233,7 +233,7 @@ public class GuiInputter extends GuiContainer{
compound.setInteger("Y", this.y);
compound.setInteger("Z", this.z);
compound.setInteger("WorldID", this.world.provider.getDimension());
compound.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
compound.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
compound.setInteger("NumberID", textID);
compound.setInteger("Number", text);
PacketHandler.theNetwork.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_NUMBER_TO_TILE_HANDLER));

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiOilGenerator extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java
View file

@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.io.IOException;
@SideOnly(Side.CLIENT)
public class GuiRepairer extends GuiContainer{

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
View file

@ -120,7 +120,7 @@ public class GuiSmileyCloud extends GuiContainer{
compound.setInteger("Y", this.y);
compound.setInteger("Z", this.z);
compound.setInteger("WorldID", this.world.provider.getDimension());
compound.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
compound.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
compound.setInteger("TextID", textID);
compound.setString("Text", text);
PacketHandler.theNetwork.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_STRING_TO_TILE_HANDLER));

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
View file

@ -85,6 +85,6 @@ public class GuiXPSolidifier extends GuiContainer{
public void actionPerformed(GuiButton button){
PacketHandlerHelper.sendButtonPacket(this.solidifier, button.id);
this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().thePlayer);
this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().player);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java
View file

@ -16,9 +16,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler.GuiTypes;
import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;

1
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
View file

@ -20,7 +20,6 @@ import net.darkhax.tesla.api.ITeslaConsumer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
View file

@ -102,9 +102,9 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
@Override
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
if(posHit != null && posHit.getBlockPos() != null){
IBlockState state = minecraft.theWorld.getBlockState(posHit.getBlockPos());
IBlockState state = minecraft.world.getBlockState(posHit.getBlockPos());
Block block = state.getBlock();
if(block != null && !block.isAir(minecraft.theWorld.getBlockState(posHit.getBlockPos()), minecraft.theWorld, posHit.getBlockPos())){
if(block != null && !block.isAir(minecraft.world.getBlockState(posHit.getBlockPos()), minecraft.world, posHit.getBlockPos())){
ItemStack blockStack = new ItemStack(block, 1, block.getMetaFromState(state));
int height = resolution.getScaledHeight()/5*3;
if(player.isSneaking()){

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java
View file

@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemCrystal extends ItemBase{
private final boolean isEmpowered;

Some files were not shown because too many files have changed in this diff Show more