diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java index 97ab1919c..f8e9bd175 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java @@ -11,7 +11,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java index f74a070f2..19d3627cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java @@ -34,9 +34,9 @@ import java.util.concurrent.ConcurrentHashMap; public class WorldData extends WorldSavedData{ public static final String DATA_TAG = ModUtil.MOD_ID+"data"; - private static WorldData data; //TODO Remove this as well public static List legacyLoadWorlds = new ArrayList(); + private static WorldData data; public final ConcurrentSet laserRelayNetworks = new ConcurrentSet(); public final ConcurrentHashMap playerSaveData = new ConcurrentHashMap(); @@ -106,6 +106,16 @@ public class WorldData extends WorldSavedData{ return get(world, false); } + //TODO Remove old loading mechanic after a while because it's legacy + public static void loadLegacy(World world){ + if(!world.isRemote && world instanceof WorldServer){ + int dim = world.provider.getDimension(); + ISaveHandler handler = new WorldSpecificSaveHandler((WorldServer)world, world.getSaveHandler()); + File dataFile = handler.getMapFileFromName(DATA_TAG+dim); + legacyLoadWorlds.add(dataFile); + } + } + //TODO Remove merging once removing old save handler private void readFromNBT(NBTTagCompound compound, boolean merge){ //Laser World Data @@ -165,14 +175,4 @@ public class WorldData extends WorldSavedData{ return compound; } - - //TODO Remove old loading mechanic after a while because it's legacy - public static void loadLegacy(World world){ - if(!world.isRemote && world instanceof WorldServer){ - int dim = world.provider.getDimension(); - ISaveHandler handler = new WorldSpecificSaveHandler((WorldServer)world, world.getSaveHandler()); - File dataFile = handler.getMapFileFromName(DATA_TAG+dim); - legacyLoadWorlds.add(dataFile); - } - } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java index c22b35a61..8df8fb676 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java @@ -51,7 +51,7 @@ public class ItemWorm extends ItemBase{ EntityWorm worm = new EntityWorm(world); worm.setPosition(pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5); world.spawnEntity(worm); - + if(!player.capabilities.isCreativeMode){ player.setHeldItem(hand, StackUtil.addStackSize(stack, -1)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java index c61e3ef0b..9d3d264aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java @@ -1,5 +1,5 @@ /* - * This file ("CrusherRecipeHandler.java") is part of the Actually Additions mod for Minecraft. + * This file ("ReedFarmerBehavior.java") is part of the Actually Additions mod for Minecraft. * It is created and owned by Ellpeck and distributed * under the Actually Additions License to be found at * http://ellpeck.de/actaddlicense @@ -14,11 +14,9 @@ import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; import net.minecraft.block.Block; import net.minecraft.block.BlockReed; -import net.minecraft.block.BlockSand; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java index 29b28509d..887eae071 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java @@ -17,8 +17,8 @@ public interface INumberReactor{ /** * Called when a Number gets received after typing it in in the GUI * - * @param number The number that was sent - * @param id The ID (meaning the place in the GUI) of the number typed in + * @param number The number that was sent + * @param id The ID (meaning the place in the GUI) of the number typed in * @param player The Player doing it */ void onNumberReceived(double number, int id, EntityPlayer player); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index 8e7d4afca..748f3c4ce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -32,24 +32,20 @@ public class TileEntityFireworkBox extends TileEntityBase implements IEnergyDisp public static final int USE_PER_SHOT = 500; public final CustomEnergyStorage storage = new CustomEnergyStorage(20000, 200, 0); - private int timeUntilNextFirework; - private int oldEnergy; - public int intValuePlay = 2; - public int chargeAmount = 2; public int flightTime = 2; public float trailOrFlickerChance = 0.65F; public float flickerChance = 0.25F; public int colorAmount = 3; - public float typeChance0 = 1F; public float typeChance1 = 0F; public float typeChance2 = 0F; public float typeChance3 = 0F; public float typeChance4 = 0F; - public int areaOfEffect = 2; + private int timeUntilNextFirework; + private int oldEnergy; public TileEntityFireworkBox(){ super("fireworkBox"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index a69742391..9f3739665 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; public class TileEntityInputter extends TileEntityInventoryBase implements IButtonReactor, INumberReactor{ public static final int OKAY_BUTTON_ID = 133; + private final SlotlessableItemHandlerWrapper wrapper = new SlotlessableItemHandlerWrapper(this.slots, null); public int sideToPut = -1; public int slotToPutStart; public int slotToPutEnd; @@ -50,7 +51,6 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt private int lastPullSide; private int lastPullStart; private int lastPullEnd; - private final SlotlessableItemHandlerWrapper wrapper = new SlotlessableItemHandlerWrapper(this.slots, null); public TileEntityInputter(int slots, String name){ super(slots, name); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java index a17443b55..29522e82f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java @@ -33,10 +33,10 @@ import java.util.*; public class TileEntityItemViewer extends TileEntityBase{ - protected final SlotlessableItemHandlerWrapper itemHandler; public final List genericInfos = new ArrayList(); public final Map itemHandlerInfos = new HashMap(); public final List slotlessInfos = new ArrayList(); + protected final SlotlessableItemHandlerWrapper itemHandler; public TileEntityLaserRelayItem connectedRelay; private int lastNetworkChangeAmount = -1; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java index a01d17ff4..4810036e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java @@ -1,5 +1,5 @@ /* - * This file ("SlotlessableItemHandler.java") is part of the Actually Additions mod for Minecraft. + * This file ("SlotlessableItemHandlerWrapper.java") is part of the Actually Additions mod for Minecraft. * It is created and owned by Ellpeck and distributed * under the Actually Additions License to be found at * http://ellpeck.de/actaddlicense