From b00e214217c3d091219f9ce9477124c376cceab9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 19 May 2016 20:05:12 +0200 Subject: [PATCH] 1.9.4! Go suck a dick now. --- build.gradle | 14 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../cofh/api/energy/TileEnergyHandler.java | 67 --------- .../api/ActuallyAdditionsAPI.java | 40 +++--- .../api/lens/LensConversion.java | 2 +- .../api/recipe/BallOfFurReturn.java | 2 +- .../api/recipe/LensConversionRecipe.java | 4 +- .../api/recipe/TreasureChestLoot.java | 6 +- .../mod/achievement/InitAchievements.java | 2 +- .../mod/blocks/BlockAtomicReconstructor.java | 14 +- .../mod/blocks/BlockBreaker.java | 9 +- .../mod/blocks/BlockCanolaPress.java | 9 +- .../mod/blocks/BlockCoalGenerator.java | 6 +- .../mod/blocks/BlockCoffeeMachine.java | 10 +- .../mod/blocks/BlockColoredLamp.java | 15 +- .../mod/blocks/BlockCompost.java | 53 +++---- .../mod/blocks/BlockCrystal.java | 2 + .../mod/blocks/BlockDirectionalBreaker.java | 7 +- .../mod/blocks/BlockDropper.java | 7 +- .../mod/blocks/BlockEnergizer.java | 9 +- .../mod/blocks/BlockFeeder.java | 7 +- .../mod/blocks/BlockFermentingBarrel.java | 9 +- .../mod/blocks/BlockFireworkBox.java | 7 +- .../mod/blocks/BlockFishingNet.java | 6 +- .../mod/blocks/BlockFluidCollector.java | 11 +- .../mod/blocks/BlockFurnaceDouble.java | 8 +- .../mod/blocks/BlockFurnaceSolar.java | 6 +- .../mod/blocks/BlockGiantChest.java | 9 +- .../mod/blocks/BlockGreenhouseGlass.java | 8 +- .../mod/blocks/BlockGrinder.java | 8 +- .../mod/blocks/BlockHeatCollector.java | 5 +- .../mod/blocks/BlockImpureIron.java | 3 + .../mod/blocks/BlockInputter.java | 13 +- .../mod/blocks/BlockItemRepairer.java | 9 +- .../mod/blocks/BlockItemViewer.java | 5 +- .../mod/blocks/BlockLampPowerer.java | 4 +- .../mod/blocks/BlockLaserRelay.java | 8 +- .../blocks/BlockLavaFactoryController.java | 5 +- .../mod/blocks/BlockLeafGenerator.java | 7 +- .../mod/blocks/BlockMiner.java | 7 +- .../mod/blocks/BlockMisc.java | 14 +- .../mod/blocks/BlockOilGenerator.java | 8 +- .../mod/blocks/BlockPhantom.java | 9 +- .../mod/blocks/BlockPhantomBooster.java | 6 +- .../mod/blocks/BlockRangedCollector.java | 7 +- .../mod/blocks/BlockSlabs.java | 14 +- .../mod/blocks/BlockSmileyCloud.java | 6 +- .../mod/blocks/BlockTreasureChest.java | 9 +- .../mod/blocks/BlockWallAA.java | 15 +- .../mod/blocks/BlockWildPlant.java | 10 +- .../mod/blocks/BlockXPSolidifier.java | 7 +- .../mod/blocks/InitBlocks.java | 2 - .../mod/blocks/base/BlockBase.java | 6 +- .../mod/blocks/base/BlockBushBase.java | 6 +- .../mod/blocks/base/BlockContainerBase.java | 20 +-- .../mod/blocks/base/BlockFluidFlowing.java | 2 +- .../mod/blocks/base/BlockPlant.java | 14 +- .../mod/blocks/base/BlockStair.java | 2 +- .../mod/blocks/base/ItemBlockBase.java | 4 + .../metalists/TheColoredLampColors.java | 2 +- .../mod/blocks/render/RenderCompost.java | 4 +- .../render/RenderReconstructorLens.java | 4 +- .../mod/blocks/render/RenderSmileyCloud.java | 3 +- .../mod/booklet/BookletUtils.java | 10 +- .../mod/booklet/GuiAAAchievements.java | 6 +- .../mod/booklet/GuiBooklet.java | 21 +-- .../mod/booklet/InitBooklet.java | 1 - .../mod/booklet/button/BookmarkButton.java | 5 +- .../mod/booklet/button/IndexButton.java | 6 +- .../mod/booklet/button/TexturedButton.java | 5 +- .../mod/booklet/chapter/BookletChapter.java | 6 +- .../booklet/chapter/BookletChapterCoffee.java | 2 +- .../mod/booklet/entry/EntrySet.java | 4 +- .../mod/booklet/page/BookletPageAA.java | 6 +- .../mod/booklet/page/PageCoffeeRecipe.java | 2 +- .../mod/booklet/page/PageCrusherRecipe.java | 2 +- .../mod/booklet/page/PagePicture.java | 4 +- .../mod/booklet/page/PageReconstructor.java | 2 +- .../mod/config/ConfigValues.java | 12 +- .../mod/crafting/BlockCrafting.java | 2 +- .../mod/crafting/CrusherCrafting.java | 2 +- .../mod/crafting/ItemCrafting.java | 6 +- .../mod/crafting/MiscCrafting.java | 4 +- .../mod/crafting/ToolCrafting.java | 2 +- .../mod/creative/CreativeTab.java | 7 +- .../mod/event/WorldDecorationEvent.java | 6 +- .../mod/gen/JamVillagerTradeHandler.java | 2 +- .../gen/VillageComponentCustomCropField.java | 3 +- .../mod/gen/VillageComponentJamHouse.java | 5 +- .../mod/gen/cave/CaveWorldType.java | 9 +- .../mod/gen/cave/ChunkProviderCave.java | 28 ++-- .../mod/gen/cave/WorldGenCaveSpawn.java | 6 +- .../mod/inventory/ContainerBreaker.java | 6 +- .../mod/inventory/ContainerCanolaPress.java | 6 +- .../mod/inventory/ContainerCoalGenerator.java | 6 +- .../mod/inventory/ContainerCoffeeMachine.java | 6 +- .../mod/inventory/ContainerCrafter.java | 14 +- .../ContainerDirectionalBreaker.java | 6 +- .../mod/inventory/ContainerDrill.java | 18 ++- .../mod/inventory/ContainerDropper.java | 6 +- .../mod/inventory/ContainerEnergizer.java | 6 +- .../mod/inventory/ContainerEnervator.java | 6 +- .../mod/inventory/ContainerFeeder.java | 6 +- .../inventory/ContainerFermentingBarrel.java | 6 +- .../inventory/ContainerFluidCollector.java | 6 +- .../mod/inventory/ContainerFurnaceDouble.java | 6 +- .../mod/inventory/ContainerGiantChest.java | 6 +- .../mod/inventory/ContainerGrinder.java | 7 +- .../mod/inventory/ContainerInputter.java | 8 +- .../ContainerLaserRelayItemWhitelist.java | 6 +- .../mod/inventory/ContainerMiner.java | 6 +- .../mod/inventory/ContainerOilGenerator.java | 6 +- .../mod/inventory/ContainerPhantomPlacer.java | 6 +- .../inventory/ContainerRangedCollector.java | 6 +- .../mod/inventory/ContainerRepairer.java | 6 +- .../mod/inventory/ContainerSmileyCloud.java | 4 +- .../mod/inventory/ContainerXPSolidifier.java | 6 +- .../mod/inventory/GuiHandler.java | 2 +- .../mod/inventory/gui/GuiBreaker.java | 7 +- .../mod/inventory/gui/GuiCanolaPress.java | 2 +- .../mod/inventory/gui/GuiCoalGenerator.java | 2 +- .../mod/inventory/gui/GuiCoffeeMachine.java | 10 +- .../inventory/gui/GuiDirectionalBreaker.java | 2 +- .../mod/inventory/gui/GuiDropper.java | 7 +- .../mod/inventory/gui/GuiEnergizer.java | 2 +- .../mod/inventory/gui/GuiEnervator.java | 2 +- .../mod/inventory/gui/GuiFeeder.java | 2 +- .../inventory/gui/GuiFermentingBarrel.java | 2 +- .../mod/inventory/gui/GuiFluidCollector.java | 2 +- .../mod/inventory/gui/GuiFurnaceDouble.java | 2 +- .../mod/inventory/gui/GuiGiantChest.java | 2 +- .../mod/inventory/gui/GuiGrinder.java | 4 +- .../mod/inventory/gui/GuiInputter.java | 17 +-- .../gui/GuiLaserRelayItemWhitelist.java | 2 +- .../mod/inventory/gui/GuiMiner.java | 7 +- .../mod/inventory/gui/GuiOilGenerator.java | 2 +- .../mod/inventory/gui/GuiPhantomPlacer.java | 7 +- .../mod/inventory/gui/GuiRangedCollector.java | 10 +- .../mod/inventory/gui/GuiRepairer.java | 2 +- .../mod/inventory/gui/GuiSmileyCloud.java | 16 +-- .../mod/inventory/gui/GuiXPSolidifier.java | 15 +- .../mod/inventory/slot/SlotImmovable.java | 3 + .../mod/items/InitForeignPaxels.java | 6 +- .../mod/items/ItemAllToolAA.java | 9 +- .../mod/items/ItemAxeAA.java | 3 +- .../mod/items/ItemBattery.java | 3 + .../mod/items/ItemBooklet.java | 8 +- .../mod/items/ItemChestToCrateUpgrade.java | 6 +- .../mod/items/ItemCoffee.java | 7 +- .../mod/items/ItemCoffeeBean.java | 3 + .../mod/items/ItemCrafterOnAStick.java | 6 +- .../mod/items/ItemCrystal.java | 4 +- .../mod/items/ItemDrill.java | 16 ++- .../mod/items/ItemDrillUpgrade.java | 7 +- .../actuallyadditions/mod/items/ItemDust.java | 5 +- .../mod/items/ItemFertilizer.java | 6 +- .../mod/items/ItemFoods.java | 7 +- .../mod/items/ItemGeneric.java | 3 + .../mod/items/ItemGrowthRing.java | 4 +- .../mod/items/ItemHairyBall.java | 8 +- .../actuallyadditions/mod/items/ItemJams.java | 7 +- .../mod/items/ItemKnife.java | 9 +- .../mod/items/ItemLaserWrench.java | 3 + .../mod/items/ItemLeafBlower.java | 8 +- .../mod/items/ItemMagnetRing.java | 2 + .../mod/items/ItemMinecartAA.java | 132 ------------------ .../actuallyadditions/mod/items/ItemMisc.java | 4 +- .../mod/items/ItemPhantomConnector.java | 3 + .../mod/items/ItemPickaxeAA.java | 3 +- .../mod/items/ItemPotionRing.java | 10 +- .../items/ItemRarmorModuleReconstructor.java | 4 +- .../mod/items/ItemResonantRice.java | 6 +- .../mod/items/ItemShovelAA.java | 2 + .../mod/items/ItemSolidifiedExperience.java | 6 +- .../mod/items/ItemSpawnerChanger.java | 2 + .../mod/items/ItemTeleStaff.java | 8 +- .../mod/items/ItemWaterRemovalRing.java | 3 + .../mod/items/ItemWingsOfTheBats.java | 4 +- .../mod/items/base/ItemArmorAA.java | 9 +- .../mod/items/base/ItemBase.java | 2 +- .../mod/items/base/ItemEnergy.java | 5 +- .../mod/items/base/ItemFoodBase.java | 2 +- .../mod/items/base/ItemHoeAA.java | 9 +- .../mod/items/base/ItemSeed.java | 10 +- .../mod/items/base/ItemSwordAA.java | 11 +- .../mod/items/base/ItemToolAA.java | 10 +- .../mod/items/lens/ItemLens.java | 5 +- .../mod/items/lens/LensColor.java | 2 +- .../mod/items/lens/LensRecipeHandler.java | 4 +- .../mod/jei/JEIActuallyAdditionsPlugin.java | 8 +- .../mod/jei/RecipeWrapperWithButton.java | 8 +- .../jei/booklet/BookletRecipeCategory.java | 2 +- .../mod/jei/booklet/BookletRecipeWrapper.java | 2 +- .../coffee/CoffeeMachineRecipeCategory.java | 2 +- .../coffee/CoffeeMachineRecipeWrapper.java | 8 +- .../jei/crusher/CrusherRecipeCategory.java | 2 +- .../mod/jei/crusher/CrusherRecipeWrapper.java | 2 +- .../ReconstructorRecipeCategory.java | 2 +- .../ReconstructorRecipeWrapper.java | 2 +- .../mod/material/InitArmorMaterials.java | 7 +- .../mod/material/InitToolMaterials.java | 2 - .../mod/misc/BannerHelper.java | 8 +- .../mod/misc/DamageSources.java | 5 +- .../mod/misc/DispenserHandlerFertilize.java | 7 +- .../mod/misc/LaserRelayConnectionHandler.java | 8 +- .../mod/misc/MethodHandler.java | 8 +- ...edParticleFX.java => ParticleColored.java} | 6 +- .../actuallyadditions/mod/misc/WorldData.java | 67 +++++---- .../mod/misc/cloud/SmileyCloudEasterEggs.java | 2 +- .../mod/misc/special/SpecialRenderInit.java | 2 +- .../mod/nei/NEIBookletRecipe.java | 2 +- .../mod/nei/NEICoffeeMachineRecipe.java | 6 +- .../mod/nei/NEICrusherRecipe.java | 6 +- .../mod/nei/NEIHairyBallRecipe.java | 6 +- .../mod/nei/NEIReconstructorRecipe.java | 6 +- .../mod/nei/NEIScreenEvents.java | 2 +- .../mod/nei/NEITreasureChestRecipe.java | 6 +- .../mod/network/PacketParticle.java | 4 +- .../mod/proxy/ClientProxy.java | 11 +- .../actuallyadditions/mod/proxy/IProxy.java | 1 - .../mod/proxy/ServerProxy.java | 1 - .../mod/recipe/CrusherRecipeRegistry.java | 18 +-- .../tile/TileEntityAtomicReconstructor.java | 12 +- .../mod/tile/TileEntityBase.java | 19 +-- .../mod/tile/TileEntityBreaker.java | 9 +- .../mod/tile/TileEntityCanolaPress.java | 12 +- .../mod/tile/TileEntityCoalGenerator.java | 10 +- .../mod/tile/TileEntityCoffeeMachine.java | 12 +- .../mod/tile/TileEntityCompost.java | 8 +- .../tile/TileEntityDirectionalBreaker.java | 11 +- .../mod/tile/TileEntityDropper.java | 8 +- .../mod/tile/TileEntityEnergizer.java | 10 +- .../mod/tile/TileEntityEnervator.java | 10 +- .../mod/tile/TileEntityFeeder.java | 7 +- .../mod/tile/TileEntityFermentingBarrel.java | 4 +- .../mod/tile/TileEntityFireworkBox.java | 2 +- .../mod/tile/TileEntityFluidCollector.java | 2 +- .../mod/tile/TileEntityFurnaceDouble.java | 10 +- .../mod/tile/TileEntityFurnaceSolar.java | 2 +- .../mod/tile/TileEntityGiantChest.java | 8 +- .../mod/tile/TileEntityGreenhouseGlass.java | 2 +- .../mod/tile/TileEntityGrinder.java | 9 +- .../mod/tile/TileEntityHeatCollector.java | 2 +- .../mod/tile/TileEntityInputter.java | 8 +- .../mod/tile/TileEntityInventoryBase.java | 22 +-- .../mod/tile/TileEntityItemRepairer.java | 10 +- .../mod/tile/TileEntityItemViewer.java | 16 +-- .../mod/tile/TileEntityLaserRelay.java | 16 +-- .../TileEntityLaserRelayItemWhitelist.java | 13 +- .../tile/TileEntityLavaFactoryController.java | 2 +- .../mod/tile/TileEntityLeafGenerator.java | 4 +- .../mod/tile/TileEntityMiner.java | 23 +-- .../mod/tile/TileEntityOilGenerator.java | 4 +- .../mod/tile/TileEntityPhantomItemface.java | 14 +- .../mod/tile/TileEntityPhantomPlacer.java | 9 +- .../tile/TileEntityPhantomRedstoneface.java | 8 +- .../mod/tile/TileEntityPhantomface.java | 8 +- .../mod/tile/TileEntityRangedCollector.java | 7 +- .../mod/tile/TileEntityXPSolidifier.java | 10 +- .../mod/util/FluidStateMapper.java | 8 +- .../mod/util/RecipeUtil.java | 4 +- .../actuallyadditions/mod/util/Util.java | 4 - .../actuallyadditions/mod/util/WorldUtil.java | 6 +- .../util/playerdata/PersistentServerData.java | 6 +- 264 files changed, 1109 insertions(+), 964 deletions(-) delete mode 100644 src/main/java/cofh/api/energy/TileEnergyHandler.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java rename src/main/java/de/ellpeck/actuallyadditions/mod/misc/{EntityColoredParticleFX.java => ParticleColored.java} (78%) diff --git a/build.gradle b/build.gradle index 73bb335f5..f39b5cde7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,20 +7,23 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' } } + apply plugin: 'net.minecraftforge.gradle.forge' +//I'm doing this because people made me do it. Even though it never worked properly when I tried it. Sigh. +apply plugin: 'idea' version = "1.9-r33" group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.9-12.16.1.1887" + version = "1.9.4-12.17.0.1909-1.9.4" runDir = "idea" - mappings = "snapshot_20160420" + mappings = "snapshot_20160519" makeObfSourceJar = false //useDepAts = true @@ -61,10 +64,13 @@ processResources { } } -jar {} +jar { + +} task deobfJar(type: Jar) { from sourceSets.main.output + from sourceSets.main.java classifier = 'dev' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848f1..6917d27a0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java deleted file mode 100644 index 3ba60a664..000000000 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -/** - * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own. - * - * This class is really meant to summarize how each interface is properly used. - * - * @author King Lemming - * - */ -public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider { - - protected EnergyStorage storage = new EnergyStorage(32000); - - @Override - public void readFromNBT(NBTTagCompound nbt) { - - super.readFromNBT(nbt); - storage.readFromNBT(nbt); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - - super.writeToNBT(nbt); - storage.writeToNBT(nbt); - } - - /* IEnergyConnection */ - @Override - public boolean canConnectEnergy(EnumFacing from) { - - return true; - } - - /* IEnergyReceiver */ - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - - return storage.receiveEnergy(maxReceive, simulate); - } - - /* IEnergyProvider */ - @Override - public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - - return storage.extractEnergy(maxExtract, simulate); - } - - /* IEnergyHandler */ - @Override - public int getEnergyStored(EnumFacing from) { - - return storage.getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - - return storage.getMaxEnergyStored(); - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java index 672a84f33..47b6a4f47 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -29,7 +29,7 @@ public class ActuallyAdditionsAPI{ public static final String MOD_ID = "actuallyadditions"; public static final String API_ID = MOD_ID+"api"; - public static final String API_VERSION = "13"; + public static final String API_VERSION = "14"; /** * Use this to handle things that aren't based in the API itself @@ -38,15 +38,15 @@ public class ActuallyAdditionsAPI{ */ public static IMethodHandler methodHandler; - public static List crusherRecipes = new ArrayList(); - public static List ballOfFurReturnItems = new ArrayList(); - public static List treasureChestLoot = new ArrayList(); - public static List reconstructorLensConversionRecipes = new ArrayList(); - public static Map reconstructorLensColorChangers = new HashMap(); - public static List coffeeMachineIngredients = new ArrayList(); + public static final List CRUSHER_RECIPES = new ArrayList(); + public static final List BALL_OF_FUR_RETURN_ITEMS = new ArrayList(); + public static final List TREASURE_CHEST_LOOT = new ArrayList(); + public static final List RECONSTRUCTOR_LENS_CONVERSION_RECIPES = new ArrayList(); + public static final Map RECONSTRUCTOR_LENS_COLOR_CHANGERS = new HashMap(); + public static final List COFFEE_MACHINE_INGREDIENTS = new ArrayList(); - public static List bookletEntries = new ArrayList(); - public static List bookletPagesWithItemStackData = new ArrayList(); + public static final List BOOKLET_ENTRIES = new ArrayList(); + public static final List BOOKLET_PAGES_WITH_ITEM_DATA = new ArrayList(); //These are getting initialized in Actually Additions' PreInit phase //DO NOT CHANGE/OVERRIDE THESE!! @@ -92,7 +92,7 @@ public class ActuallyAdditionsAPI{ */ public static void addCrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){ if(!OreDictionary.getOres(input, false).isEmpty() && !OreDictionary.getOres(outputOne, false).isEmpty() && (outputTwo == null || outputTwo.isEmpty() || !OreDictionary.getOres(outputTwo, false).isEmpty())){ - crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance)); + CRUSHER_RECIPES.add(new CrusherRecipe(input, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance)); } } @@ -117,7 +117,7 @@ public class ActuallyAdditionsAPI{ * @param outputTwoChance The chance of the second output (0 won't occur at all, 100 will all the time) */ public static void addCrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){ - crusherRecipes.add(new CrusherRecipe(input, outputOne, outputTwo, outputTwoChance)); + CRUSHER_RECIPES.add(new CrusherRecipe(input, outputOne, outputTwo, outputTwoChance)); } /** @@ -130,7 +130,7 @@ public class ActuallyAdditionsAPI{ */ public static void addCrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){ if(!OreDictionary.getOres(outputOne, false).isEmpty()){ - crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount)); + CRUSHER_RECIPES.add(new CrusherRecipe(input, outputOne, outputOneAmount)); } } @@ -141,7 +141,7 @@ public class ActuallyAdditionsAPI{ * @param chance The chance (this is from WeightedRandom.Item) */ public static void addBallOfFurReturnItem(ItemStack stack, int chance){ - ballOfFurReturnItems.add(new BallOfFurReturn(stack, chance)); + BALL_OF_FUR_RETURN_ITEMS.add(new BallOfFurReturn(stack, chance)); } /** @@ -153,7 +153,7 @@ public class ActuallyAdditionsAPI{ * @param maxAmount The maximum stacksize of the returned stack */ public static void addTreasureChestLoot(ItemStack stack, int chance, int minAmount, int maxAmount){ - treasureChestLoot.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount)); + TREASURE_CHEST_LOOT.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount)); } /** @@ -167,7 +167,7 @@ public class ActuallyAdditionsAPI{ * Note how this always has to be the same instance of the lens type that the item also has for it to work! */ public static void addReconstructorLensConversionRecipe(ItemStack input, ItemStack output, int energyUse, LensConversion type){ - reconstructorLensConversionRecipes.add(new LensConversionRecipe(input, output, energyUse, type)); + RECONSTRUCTOR_LENS_CONVERSION_RECIPES.add(new LensConversionRecipe(input, output, energyUse, type)); } public static void addReconstructorLensConversionRecipe(ItemStack input, ItemStack output, int energyUse){ @@ -184,7 +184,7 @@ public class ActuallyAdditionsAPI{ * Note how this always has to be the same instance of the lens type that the item also has for it to work! */ public static void addReconstructorLensConversionRecipe(String input, String output, int energyUse, LensConversion type){ - reconstructorLensConversionRecipes.add(new LensConversionRecipe(input, output, energyUse, type)); + RECONSTRUCTOR_LENS_CONVERSION_RECIPES.add(new LensConversionRecipe(input, output, energyUse, type)); } public static void addReconstructorLensConversionRecipe(String input, String output, int energyUse){ @@ -201,7 +201,7 @@ public class ActuallyAdditionsAPI{ * @param changer The change mechanism */ public static void addReconstructorLensColorChangeItem(Item item, IColorLensChanger changer){ - reconstructorLensColorChangers.put(item, changer); + RECONSTRUCTOR_LENS_COLOR_CHANGERS.put(item, changer); } /** @@ -210,7 +210,7 @@ public class ActuallyAdditionsAPI{ * @param ingredient The ingredient to add */ public static void addCoffeeMachineIngredient(CoffeeIngredient ingredient){ - coffeeMachineIngredients.add(ingredient); + COFFEE_MACHINE_INGREDIENTS.add(ingredient); } /** @@ -219,7 +219,7 @@ public class ActuallyAdditionsAPI{ * @param entry The entry to add */ public static void addBookletEntry(IBookletEntry entry){ - bookletEntries.add(entry); + BOOKLET_ENTRIES.add(entry); } /** @@ -229,6 +229,6 @@ public class ActuallyAdditionsAPI{ * @param page The page to add */ public static void addPageWithItemStackData(BookletPage page){ - bookletPagesWithItemStackData.add(page); + BOOKLET_PAGES_WITH_ITEM_DATA.add(page); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java index a187717bb..9df5094be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; /** * This is the base class for a Reconstructor Lens Type that converts two items - * via the ActuallyAdditionsAPI.reconstructorLensConversionRecipes list. + * via the ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES list. * * If you want to make a new type of conversion, just use your type in the recipe * If you want to use the default type of conversion, use ActuallyAdditionsAPI.lensDefaultConversion. diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java index ddd719438..e2006733c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java @@ -15,7 +15,7 @@ import net.minecraft.util.WeightedRandom; public class BallOfFurReturn extends WeightedRandom.Item{ - public ItemStack returnItem; + public final ItemStack returnItem; public BallOfFurReturn(ItemStack returnItem, int chance){ super(chance); diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java index 4def0f0f2..43edbcc13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java @@ -20,8 +20,8 @@ import java.util.List; public class LensConversionRecipe{ - public int energyUse; - public LensConversion type; + public final int energyUse; + public final LensConversion type; private String input; private String output; private ItemStack inputStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java index 29873bb7c..df310f16f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java @@ -15,9 +15,9 @@ import net.minecraft.util.WeightedRandom; public class TreasureChestLoot extends WeightedRandom.Item{ - public ItemStack returnItem; - public int minAmount; - public int maxAmount; + public final ItemStack returnItem; + public final int minAmount; + public final int maxAmount; public TreasureChestLoot(ItemStack returnItem, int chance, int minAmount, int maxAmount){ super(chance); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java index a2f9b415f..808822e58 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java @@ -21,7 +21,7 @@ public class InitAchievements{ public static int pageNumber; public static AchievementPage theAchievementPage; - public static ArrayList achievementList = new ArrayList(); + public static final ArrayList achievementList = new ArrayList(); public static void init(){ ModUtil.LOGGER.info("Initializing Achievements..."); 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 2b417ff34..ad909378c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -40,6 +40,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay{ @@ -84,8 +85,9 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud } } else{ - if(reconstructor.getStackInSlot(0) != null){ - player.inventory.setInventorySlotContents(player.inventory.currentItem, reconstructor.getStackInSlot(0).copy()); + ItemStack slot = reconstructor.getStackInSlot(0); + if(slot != null){ + player.inventory.setInventorySlotContents(player.inventory.currentItem, slot.copy()); reconstructor.setInventorySlotContents(0, null); } } @@ -94,13 +96,14 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud return true; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int i){ + public TileEntity createNewTileEntity(@Nonnull World world, int i){ return new TileEntityAtomicReconstructor(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } @@ -159,6 +162,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -170,7 +174,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ + public void addInformation(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull List list, boolean bool){ long sysTime = System.currentTimeMillis(); if(this.lastSysTime+3000 < sysTime){ 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 af3c12ba2..072a50315 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -32,10 +32,12 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockBreaker extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); - private boolean isPlacer; + private final boolean isPlacer; public BlockBreaker(boolean isPlacer, String name){ super(Material.ROCK, name); @@ -46,8 +48,9 @@ public class BlockBreaker extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return this.isPlacer ? new TileEntityPlacer() : new TileEntityBreaker(); } @@ -85,7 +88,7 @@ public class BlockBreaker extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 5a56dabea..96fdadc62 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -26,6 +26,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockCanolaPress extends BlockContainerBase{ public BlockCanolaPress(String name){ @@ -36,8 +38,9 @@ public class BlockCanolaPress extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityCanolaPress(); } @@ -46,7 +49,7 @@ public class BlockCanolaPress extends BlockContainerBase{ if(!world.isRemote){ TileEntityCanolaPress press = (TileEntityCanolaPress)world.getTileEntity(pos); if(press != null){ - if(!this.tryUseItemOnTank(player, stack, side, press)){ + if(this.checkFailUseItemOnTank(player, stack, side, press)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CANOLA_PRESS.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } @@ -61,7 +64,7 @@ public class BlockCanolaPress extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 f73329b7f..d9c14ff0b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockCoalGenerator extends BlockContainerBase{ @@ -48,8 +49,9 @@ public class BlockCoalGenerator extends BlockContainerBase{ this.setTickRandomly(true); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityCoalGenerator(); } @@ -88,7 +90,7 @@ public class BlockCoalGenerator extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 e2055d1e0..c6a36ccb5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -32,6 +32,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockCoffeeMachine extends BlockContainerBase{ private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1-0.0625, 1-0.0625*2, 1-0.0625); @@ -46,6 +48,7 @@ public class BlockCoffeeMachine extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; @@ -66,7 +69,7 @@ public class BlockCoffeeMachine extends BlockContainerBase{ if(!world.isRemote){ TileEntityCoffeeMachine machine = (TileEntityCoffeeMachine)world.getTileEntity(pos); if(machine != null){ - if(!this.tryUseItemOnTank(player, stack, f6, machine)){ + if(this.checkFailUseItemOnTank(player, stack, f6, machine)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.COFFEE_MACHINE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } @@ -75,13 +78,14 @@ public class BlockCoffeeMachine extends BlockContainerBase{ return true; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int meta){ + public TileEntity createNewTileEntity(@Nonnull World world, int meta){ return new TileEntityCoffeeMachine(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 8f3a99026..103204861 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -37,14 +37,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; public class BlockColoredLamp extends BlockBase{ - public static TheColoredLampColors[] allLampTypes = TheColoredLampColors.values(); + public static final TheColoredLampColors[] allLampTypes = TheColoredLampColors.values(); private static final PropertyInteger META = PropertyInteger.create("meta", 0, allLampTypes.length-1); - public boolean isOn; + public final boolean isOn; public BlockColoredLamp(boolean isOn, String name){ super(Material.REDSTONE_LIGHT, name); @@ -100,7 +101,7 @@ public class BlockColoredLamp extends BlockBase{ } @Override - public ItemStack createStackedBlock(IBlockState state){ + public ItemStack createStackedBlock(@Nonnull IBlockState state){ return new ItemStack(InitBlocks.blockColoredLamp, 1, this.getMetaFromState(state)); } @@ -113,7 +114,7 @@ public class BlockColoredLamp extends BlockBase{ } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){ return this.isOn ? 15 : 0; } @@ -147,14 +148,16 @@ public class BlockColoredLamp extends BlockBase{ this.setMaxDamage(0); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack){ + public String getItemStackDisplayName(@Nonnull ItemStack stack){ if(stack.getItemDamage() >= allLampTypes.length){ - return null; + return StringUtil.BUGGED_ITEM_NAME; } return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.block).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".onSuffix.desc")+")" : ""); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 3dd70aaa8..3314dd49a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -39,6 +39,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class BlockCompost extends BlockContainerBase implements IHudDisplay{ @@ -60,13 +61,14 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ //this.setBlockBoundsForItemRender(); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn){ + public void addCollisionBoxToList(IBlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List collidingBoxes, Entity entityIn){ addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_LEGS); addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_WALL_WEST); addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_WALL_NORTH); @@ -88,42 +90,45 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stackPlayer, EnumFacing f6, float f7, float f8, float f9){ if(!world.isRemote){ TileEntityCompost tile = (TileEntityCompost)world.getTileEntity(pos); - //Add items to be composted - if(stackPlayer != null && stackPlayer.getItem() instanceof ItemMisc && stackPlayer.getItemDamage() == TheMiscItems.MASHED_FOOD.ordinal() && (tile.slots[0] == null || (!(tile.slots[0].getItem() instanceof ItemFertilizer) && tile.slots[0].stackSize < TileEntityCompost.AMOUNT))){ - if(tile.slots[0] == null){ - tile.slots[0] = new ItemStack(stackPlayer.getItem(), 1, TheMiscItems.MASHED_FOOD.ordinal()); + if(tile != null){ + //Add items to be composted + if(stackPlayer != null && stackPlayer.getItem() instanceof ItemMisc && stackPlayer.getItemDamage() == TheMiscItems.MASHED_FOOD.ordinal() && (tile.slots[0] == null || (!(tile.slots[0].getItem() instanceof ItemFertilizer) && tile.slots[0].stackSize < TileEntityCompost.AMOUNT))){ + if(tile.slots[0] == null){ + tile.slots[0] = new ItemStack(stackPlayer.getItem(), 1, TheMiscItems.MASHED_FOOD.ordinal()); + } + else{ + tile.slots[0].stackSize++; + } + if(!player.capabilities.isCreativeMode){ + stackPlayer.stackSize--; + } + tile.markDirty(); } - else{ - tile.slots[0].stackSize++; - } - if(!player.capabilities.isCreativeMode){ - player.inventory.getCurrentItem().stackSize--; - } - tile.markDirty(); - } - //Add Fertilizer to player's inventory - else if(tile.slots[0] != null && (stackPlayer == null || (stackPlayer.getItem() instanceof ItemFertilizer && stackPlayer.stackSize <= stackPlayer.getMaxStackSize()-tile.slots[0].stackSize)) && tile.slots[0].getItem() instanceof ItemFertilizer){ - if(stackPlayer == null){ - player.inventory.setInventorySlotContents(player.inventory.currentItem, tile.slots[0].copy()); + //Add Fertilizer to player's inventory + else if(tile.slots[0] != null && (stackPlayer == null || (stackPlayer.getItem() instanceof ItemFertilizer && stackPlayer.stackSize <= stackPlayer.getMaxStackSize()-tile.slots[0].stackSize)) && tile.slots[0].getItem() instanceof ItemFertilizer){ + if(stackPlayer == null){ + player.inventory.setInventorySlotContents(player.inventory.currentItem, tile.slots[0].copy()); + } + else{ + stackPlayer.stackSize += tile.slots[0].stackSize; + } + tile.slots[0] = null; + tile.markDirty(); } - else{ - stackPlayer.stackSize += tile.slots[0].stackSize; - } - tile.slots[0] = null; - tile.markDirty(); } } return true; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int meta){ + public TileEntity createNewTileEntity(@Nonnull World world, int meta){ return new TileEntityCompost(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 083d3ba9e..9572745d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class BlockCrystal extends BlockBase{ @@ -84,6 +85,7 @@ public class BlockCrystal extends BlockBase{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allCrystals[stack.getItemDamage()].name; 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 0ffd5342b..b7fc191d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -31,6 +31,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockDirectionalBreaker extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); @@ -43,8 +45,9 @@ public class BlockDirectionalBreaker extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityDirectionalBreaker(); } @@ -82,7 +85,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 502b455b1..aae3d739b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -30,6 +30,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockDropper extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); @@ -42,8 +44,9 @@ public class BlockDropper extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityDropper(); } @@ -81,7 +84,7 @@ public class BlockDropper extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 559b7f69e..337333a5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -27,9 +27,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockEnergizer extends BlockContainerBase{ - private boolean isEnergizer; + private final boolean isEnergizer; public BlockEnergizer(boolean isEnergizer, String name){ super(Material.ROCK, name); @@ -40,8 +42,9 @@ public class BlockEnergizer extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return this.isEnergizer ? new TileEntityEnergizer() : new TileEntityEnervator(); } @@ -71,7 +74,7 @@ public class BlockEnergizer extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index c9b558659..80d2d63ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -26,6 +26,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFeeder extends BlockContainerBase{ public BlockFeeder(String name){ @@ -36,8 +38,9 @@ public class BlockFeeder extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFeeder(); } @@ -59,7 +62,7 @@ public class BlockFeeder extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index 584a93fa0..b6a6e8910 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -26,6 +26,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFermentingBarrel extends BlockContainerBase{ public BlockFermentingBarrel(String name){ @@ -36,13 +38,14 @@ public class BlockFermentingBarrel extends BlockContainerBase{ this.setSoundType(SoundType.WOOD); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFermentingBarrel(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } @@ -52,7 +55,7 @@ public class BlockFermentingBarrel extends BlockContainerBase{ if(!world.isRemote){ TileEntityFermentingBarrel press = (TileEntityFermentingBarrel)world.getTileEntity(pos); if(press != null){ - if(!this.tryUseItemOnTank(player, heldItem, par6, press)){ + if(this.checkFailUseItemOnTank(player, heldItem, par6, press)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FERMENTING_BARREL.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index f7cb32596..b8471edb9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -25,6 +25,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFireworkBox extends BlockContainerBase{ public BlockFireworkBox(String name){ @@ -35,8 +37,9 @@ public class BlockFireworkBox extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFireworkBox(); } @@ -51,7 +54,7 @@ public class BlockFireworkBox extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index e981c5866..bb6faf242 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -23,6 +23,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFishingNet extends BlockContainerBase{ private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.0625, 1); @@ -35,13 +37,15 @@ public class BlockFishingNet extends BlockContainerBase{ this.setSoundType(SoundType.WOOD); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFishingNet(); } 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 3d7aa97c1..dbecd1b7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -32,11 +32,13 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFluidCollector extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); - private boolean isPlacer; + private final boolean isPlacer; public BlockFluidCollector(boolean isPlacer, String name){ super(Material.ROCK, name); @@ -47,8 +49,9 @@ public class BlockFluidCollector extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return this.isPlacer ? new TileEntityFluidPlacer() : new TileEntityFluidCollector(); } @@ -60,7 +63,7 @@ public class BlockFluidCollector extends BlockContainerBase{ if(!world.isRemote){ TileEntityFluidCollector collector = (TileEntityFluidCollector)world.getTileEntity(pos); if(collector != null){ - if(!this.tryUseItemOnTank(player, stack, par6, collector)){ + if(this.checkFailUseItemOnTank(player, stack, par6, collector)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FLUID_COLLECTOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } @@ -88,7 +91,7 @@ public class BlockFluidCollector extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 0983bbbe8..638c4061e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -35,6 +35,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockFurnaceDouble extends BlockContainerBase{ @@ -50,8 +51,9 @@ public class BlockFurnaceDouble extends BlockContainerBase{ this.setTickRandomly(true); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFurnaceDouble(); } @@ -103,7 +105,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{ } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){ return PosUtil.getMetadata(state) > 3 ? 12 : 0; } @@ -138,7 +140,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 4359881d4..6f67b20aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -23,6 +23,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockFurnaceSolar extends BlockContainerBase{ private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 6*0.0625, 1); @@ -35,13 +37,15 @@ public class BlockFurnaceSolar extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityFurnaceSolar(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 05f0722d7..d27503e1e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -32,6 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.ArrayList; public class BlockGiantChest extends BlockContainerBase{ @@ -44,8 +45,9 @@ public class BlockGiantChest extends BlockContainerBase{ this.setSoundType(SoundType.WOOD); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityGiantChest(); } @@ -83,8 +85,9 @@ public class BlockGiantChest extends BlockContainerBase{ super.onBlockPlacedBy(world, pos, state, entity, stack); } + @Nonnull @Override - public ArrayList getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ + public ArrayList getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ ArrayList drops = super.getDrops(world, pos, state, fortune); TileEntity tile = world.getTileEntity(pos); @@ -118,7 +121,7 @@ public class BlockGiantChest extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityGiantChest){ if(!ItemUtil.contains(((TileEntityGiantChest)tile).slots, new ItemStack(InitItems.itemCrateKeeper), false)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index 6a0d28d4c..ed517c75d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockGreenhouseGlass extends BlockContainerBase{ public BlockGreenhouseGlass(String name){ @@ -44,7 +46,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase{ @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side){ + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess worldIn, @Nonnull BlockPos pos, EnumFacing side){ Block block = state.getBlock(); return worldIn.getBlockState(pos.offset(side.getOpposite())) != state || block != this && block != this && super.shouldSideBeRendered(state, worldIn, pos, side); @@ -55,6 +57,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase{ return false; } + @Nonnull @Override @SideOnly(Side.CLIENT) public BlockRenderLayer getBlockLayer(){ @@ -66,8 +69,9 @@ public class BlockGreenhouseGlass extends BlockContainerBase{ return EnumRarity.EPIC; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityGreenhouseGlass(); } } 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 ffab840ea..3f0a01a51 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -34,6 +34,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockGrinder extends BlockContainerBase{ @@ -51,8 +52,9 @@ public class BlockGrinder extends BlockContainerBase{ this.setTickRandomly(true); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return this.isDouble ? new TileEntityGrinderDouble() : new TileEntityGrinder(); } @@ -84,7 +86,7 @@ public class BlockGrinder extends BlockContainerBase{ } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){ return PosUtil.getMetadata(pos, world) == 1 ? 12 : 0; } @@ -99,7 +101,7 @@ public class BlockGrinder extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index 0106f57e0..9bf8b2f9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -19,6 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockHeatCollector extends BlockContainerBase{ public BlockHeatCollector(String name){ @@ -29,8 +31,9 @@ public class BlockHeatCollector extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityHeatCollector(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockImpureIron.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockImpureIron.java index 8639fb69e..824a0bac9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockImpureIron.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockImpureIron.java @@ -25,6 +25,8 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.WorldServer; +import javax.annotation.Nonnull; + public class BlockImpureIron extends BlockGeneric{ public BlockImpureIron(String name){ @@ -44,6 +46,7 @@ public class BlockImpureIron extends BlockGeneric{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index 4423ff778..9a9631089 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -34,11 +34,13 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockInputter extends BlockContainerBase{ public static final int NAME_FLAVOR_AMOUNTS = 15; - public boolean isAdvanced; + public final boolean isAdvanced; public BlockInputter(boolean isAdvanced, String name){ super(Material.ROCK, name); @@ -50,8 +52,9 @@ public class BlockInputter extends BlockContainerBase{ this.isAdvanced = isAdvanced; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return this.isAdvanced ? new TileEntityInputterAdvanced() : new TileEntityInputter(); } @@ -68,7 +71,7 @@ public class BlockInputter extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ if(!world.isRemote){ TileEntity aTile = world.getTileEntity(pos); if(aTile instanceof TileEntityInventoryBase){ @@ -100,6 +103,7 @@ public class BlockInputter extends BlockContainerBase{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -110,8 +114,9 @@ public class BlockInputter extends BlockContainerBase{ return damage; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack){ + public String getItemStackDisplayName(@Nonnull ItemStack stack){ long sysTime = System.currentTimeMillis(); if(this.lastSysTime+5000 < sysTime){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index 9de86c201..cf4573ea9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -29,6 +29,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockItemRepairer extends BlockContainerBase{ public BlockItemRepairer(String name){ @@ -40,8 +42,9 @@ public class BlockItemRepairer extends BlockContainerBase{ this.setTickRandomly(true); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityItemRepairer(); } @@ -58,7 +61,7 @@ public class BlockItemRepairer extends BlockContainerBase{ } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){ + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){ return PosUtil.getMetadata(pos, world) == 1 ? 12 : 0; } @@ -68,7 +71,7 @@ public class BlockItemRepairer extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java index 883a2b3dd..d732577a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java @@ -19,6 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockItemViewer extends BlockContainerBase{ public BlockItemViewer(String name){ @@ -29,8 +31,9 @@ public class BlockItemViewer extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World worldIn, int meta){ + public TileEntity createNewTileEntity(@Nonnull World worldIn, int meta){ return new TileEntityItemViewer(); } 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 19ad88cbb..7b28c56be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -39,8 +39,8 @@ public class BlockLampPowerer extends BlockBase{ } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock){ - this.updateLamp(world, pos); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){ + this.updateLamp(worldIn, pos); } @Override 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 32f96858f..c16acfd38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -31,10 +31,12 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockLaserRelay extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); - private Type type; + private final Type type; public BlockLaserRelay(String name, Type type){ super(Material.ROCK, name); @@ -56,6 +58,7 @@ public class BlockLaserRelay extends BlockContainerBase{ return false; } + @Nonnull @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){ return this.getStateFromMeta(side.ordinal()); @@ -85,8 +88,9 @@ public class BlockLaserRelay extends BlockContainerBase{ return false; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int i){ + public TileEntity createNewTileEntity(@Nonnull World world, int i){ switch(this.type){ case ITEM: return new TileEntityLaserRelayItem(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index 7459c4c06..51f851185 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -28,6 +28,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockLavaFactoryController extends BlockContainerBase implements IHudDisplay{ public BlockLavaFactoryController(String name){ @@ -38,8 +40,9 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IH this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityLavaFactoryController(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index ed1d2ebd7..d788ea5ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockLeafGenerator extends BlockContainerBase{ public BlockLeafGenerator(String name){ @@ -31,8 +33,9 @@ public class BlockLeafGenerator extends BlockContainerBase{ this.setSoundType(SoundType.METAL); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityLeafGenerator(); } @@ -42,7 +45,7 @@ public class BlockLeafGenerator extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index 452002a96..87e6986cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -34,6 +34,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockMiner extends BlockContainerBase implements IHudDisplay{ public BlockMiner(String name){ @@ -65,13 +67,14 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{ return EnumRarity.RARE; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int i){ + public TileEntity createNewTileEntity(@Nonnull World world, int i){ return new TileEntityMiner(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 6203a5c6e..f8f803efb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -27,12 +27,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; 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 static final TheMiscBlocks[] ALL_MISC_BLOCKS = TheMiscBlocks.values(); + private static final PropertyInteger META = PropertyInteger.create("meta", 0, ALL_MISC_BLOCKS.length-1); public BlockMisc(String name){ super(Material.ROCK, name); @@ -49,7 +50,7 @@ public class BlockMisc extends BlockBase{ @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list){ - for(int j = 0; j < allMiscBlocks.length; j++){ + for(int j = 0; j < ALL_MISC_BLOCKS.length; j++){ list.add(new ItemStack(item, 1, j)); } } @@ -61,14 +62,14 @@ public class BlockMisc extends BlockBase{ @Override protected void registerRendering(){ - for(int i = 0; i < allMiscBlocks.length; i++){ + for(int i = 0; i < ALL_MISC_BLOCKS.length; i++){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(this.getRegistryName(), META.getName()+"="+i)); } } @Override public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allMiscBlocks.length ? EnumRarity.COMMON : allMiscBlocks[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? EnumRarity.COMMON : ALL_MISC_BLOCKS[stack.getItemDamage()].rarity; } @Override @@ -84,9 +85,10 @@ public class BlockMisc extends BlockBase{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= allMiscBlocks.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allMiscBlocks[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_MISC_BLOCKS[stack.getItemDamage()].name; } } } 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 b0883ea80..e2fb09a1c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockOilGenerator extends BlockContainerBase{ @@ -48,8 +49,9 @@ public class BlockOilGenerator extends BlockContainerBase{ this.setTickRandomly(true); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityOilGenerator(); } @@ -68,7 +70,7 @@ public class BlockOilGenerator extends BlockContainerBase{ if(!world.isRemote){ TileEntityOilGenerator generator = (TileEntityOilGenerator)world.getTileEntity(pos); if(generator != null){ - if(!this.tryUseItemOnTank(player, stack, par6, generator)){ + if(this.checkFailUseItemOnTank(player, stack, par6, generator)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.OIL_GENERATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } @@ -88,7 +90,7 @@ public class BlockOilGenerator extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index d8a095ba6..b25d5c405 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -39,9 +39,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockPhantom extends BlockContainerBase implements IHudDisplay{ - public Type type; + public final Type type; public BlockPhantom(Type type, String name){ super(Material.ROCK, name); @@ -80,15 +82,16 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ if(this.type == Type.PLACER || this.type == Type.BREAKER){ this.dropInventory(world, pos); } super.breakBlock(world, pos, state); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ switch(this.type){ case PLACER: return new TileEntityPhantomPlacer(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 5ddd375e6..e3963fd61 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -23,6 +23,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockPhantomBooster extends BlockContainerBase{ private static final AxisAlignedBB AABB = new AxisAlignedBB(2*0.0625, 0, 2*0.0625, 1-2*0.0625, 1, 1-2*0.0625); @@ -35,6 +37,7 @@ public class BlockPhantomBooster extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; @@ -55,8 +58,9 @@ public class BlockPhantomBooster extends BlockContainerBase{ return EnumRarity.EPIC; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int i){ + public TileEntity createNewTileEntity(@Nonnull World world, int i){ return new TileEntityPhantomBooster(); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index c14e25eae..b616b5416 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -26,6 +26,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockRangedCollector extends BlockContainerBase{ public BlockRangedCollector(String name){ @@ -36,8 +38,9 @@ public class BlockRangedCollector extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityRangedCollector(); } @@ -59,7 +62,7 @@ public class BlockRangedCollector extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ if(!world.isRemote){ TileEntity aTile = world.getTileEntity(pos); if(aTile instanceof TileEntityRangedCollector){ 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 4dff97682..b7f6289be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -31,14 +31,16 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockSlabs extends BlockBase{ private static final AxisAlignedBB AABB_BOTTOM_HALF = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); private static final AxisAlignedBB AABB_TOP_HALF = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); private static final PropertyInteger META = PropertyInteger.create("meta", 0, 1); - private Block fullBlock; - private int meta; + private final Block fullBlock; + private final int meta; public BlockSlabs(String name, Block fullBlock){ this(name, fullBlock, 0); @@ -76,6 +78,7 @@ public class BlockSlabs extends BlockBase{ return false; } + @Nonnull @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){ if(facing.ordinal() == 1){ @@ -87,6 +90,7 @@ public class BlockSlabs extends BlockBase{ return this.getStateFromMeta(meta); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return state.getValue(META) == 1 ? AABB_TOP_HALF : AABB_BOTTOM_HALF; @@ -115,8 +119,9 @@ public class BlockSlabs extends BlockBase{ this.setMaxDamage(0); } + @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(ItemStack stack, @Nonnull EntityPlayer playerIn, World worldIn, @Nonnull BlockPos pos, EnumHand hand, @Nonnull EnumFacing facing, float hitX, float hitY, float hitZ){ if(stack.stackSize != 0 && playerIn.canPlayerEdit(pos.offset(facing), facing, stack)){ IBlockState state = worldIn.getBlockState(pos); @@ -145,7 +150,7 @@ public class BlockSlabs extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack stack){ + public boolean canPlaceBlockOnSide(World worldIn, @Nonnull BlockPos pos, @Nonnull EnumFacing side, EntityPlayer player, @Nonnull ItemStack stack){ IBlockState state = worldIn.getBlockState(pos); if(state.getBlock() == this.block){ @@ -177,6 +182,7 @@ public class BlockSlabs extends BlockBase{ return false; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); 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 3777eda2c..e25b3cc6b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -36,6 +36,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSmileyCloud extends BlockContainerBase{ @@ -86,13 +87,14 @@ public class BlockSmileyCloud extends BlockContainerBase{ return true; } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int meta){ + public TileEntity createNewTileEntity(@Nonnull World world, int meta){ return new TileEntitySmileyCloud(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } 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 345294052..f3b9f64f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -27,7 +27,6 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -35,6 +34,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Random; public class BlockTreasureChest extends BlockBase{ @@ -98,13 +98,13 @@ public class BlockTreasureChest extends BlockBase{ } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player){ + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player){ return false; } private void dropItems(World world, BlockPos pos){ for(int i = 0; i < MathHelper.getRandomIntegerInRange(Util.RANDOM, 3, 6); i++){ - TreasureChestLoot theReturn = WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.treasureChestLoot); + TreasureChestLoot theReturn = WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.TREASURE_CHEST_LOOT); ItemStack itemStack = theReturn.returnItem.copy(); itemStack.stackSize = MathHelper.getRandomIntegerInRange(Util.RANDOM, theReturn.minAmount, theReturn.maxAmount); @@ -112,9 +112,6 @@ public class BlockTreasureChest extends BlockBase{ float dY = Util.RANDOM.nextFloat()*0.8F+0.1F; float dZ = Util.RANDOM.nextFloat()*0.8F+0.1F; EntityItem entityItem = new EntityItem(world, pos.getX()+dX, pos.getY()+dY, pos.getZ()+dZ, itemStack.copy()); - if(itemStack.hasTagCompound()){ - entityItem.getEntityItem().setTagCompound((NBTTagCompound)itemStack.getTagCompound().copy()); - } float factor = 0.05F; entityItem.motionX = Util.RANDOM.nextGaussian()*factor; entityItem.motionY = Util.RANDOM.nextGaussian()*factor+0.2F; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 9d6aeb85f..e42ff9728 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -30,6 +30,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class BlockWallAA extends BlockBase{ @@ -37,7 +38,7 @@ 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)}; protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[]{AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), AABB_BY_INDEX[15].setMaxY(1.5D)}; - private int meta; + private final int meta; public BlockWallAA(String name, Block base){ this(name, base, 0); @@ -77,8 +78,9 @@ public class BlockWallAA extends BlockBase{ return i; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos){ + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos){ boolean flag = this.canConnectTo(worldIn, pos.north()); boolean flag1 = this.canConnectTo(worldIn, pos.east()); boolean flag2 = this.canConnectTo(worldIn, pos.south()); @@ -99,10 +101,11 @@ public class BlockWallAA extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side){ + public boolean shouldSideBeRendered(IBlockState blockState, @Nonnull IBlockAccess blockAccess, @Nonnull BlockPos pos, EnumFacing side){ return side != EnumFacing.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ state = this.getActualState(state, source, pos); @@ -110,7 +113,7 @@ public class BlockWallAA extends BlockBase{ } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){ + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, @Nonnull World worldIn, @Nonnull BlockPos pos){ blockState = this.getActualState(blockState, worldIn, pos); return CLIP_AABB_BY_INDEX[yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(blockState)]; } @@ -128,7 +131,7 @@ public class BlockWallAA extends BlockBase{ @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list){ list.add(new ItemStack(item, 1, 0)); } @@ -138,6 +141,7 @@ public class BlockWallAA extends BlockBase{ return block != Blocks.BARRIER && (!(block != this && !(block instanceof BlockFenceGate)) || ((block.getMaterial(state).isOpaque() && block.isFullCube(state)) && block.getMaterial(state) != Material.GOURD)); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta){ return this.getDefaultState(); @@ -148,6 +152,7 @@ public class BlockWallAA extends BlockBase{ return 0; } + @Nonnull @Override protected BlockStateContainer createBlockState(){ return new BlockStateContainer(this, BlockWall.UP, BlockWall.NORTH, BlockWall.EAST, BlockWall.WEST, BlockWall.SOUTH); 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 e696a1a56..84a5de6a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -37,6 +37,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class BlockWildPlant extends BlockBushBase{ @@ -55,9 +56,10 @@ public class BlockWildPlant extends BlockBushBase{ return PosUtil.getMetadata(state) == TheWildPlants.RICE.ordinal() ? PosUtil.getMaterial(offset, world) == Material.WATER : PosUtil.getBlock(offset, world).canSustainPlant(world.getBlockState(offset), world, offset, EnumFacing.UP, this); } + @Nonnull @Override @SideOnly(Side.CLIENT) - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player){ + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player){ int metadata = PosUtil.getMetadata(pos, world); return metadata >= allWildPlants.length ? null : new ItemStack(((BlockPlant)allWildPlants[metadata].wildVersionOf).seedItem); } @@ -70,14 +72,15 @@ public class BlockWildPlant extends BlockBushBase{ } } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ int metadata = PosUtil.getMetadata(state); return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getDrops(world, pos, allWildPlants[metadata].wildVersionOf.getStateFromMeta(7), fortune); } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player){ + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player){ return false; } @@ -116,6 +119,7 @@ public class BlockWildPlant extends BlockBushBase{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allWildPlants.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allWildPlants[stack.getItemDamage()].name; 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 b8770aa39..4dc6b850b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -34,6 +34,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockXPSolidifier extends BlockContainerBase{ private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); @@ -46,8 +48,9 @@ public class BlockXPSolidifier extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @Nonnull @Override - public TileEntity createNewTileEntity(World world, int par2){ + public TileEntity createNewTileEntity(@Nonnull World world, int par2){ return new TileEntityXPSolidifier(); } @@ -94,7 +97,7 @@ public class BlockXPSolidifier extends BlockContainerBase{ } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state){ + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){ this.dropInventory(world, pos); TileEntity tile = world.getTileEntity(pos); if(tile instanceof 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 e14482166..e3ae22124 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -17,8 +17,6 @@ import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.util.CompatUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; public class InitBlocks{ 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 38a6fa8d9..f0ee474ec 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 @@ -21,9 +21,11 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class BlockBase extends Block{ - private String name; + private final String name; public BlockBase(Material material, String name){ super(material); @@ -58,6 +60,7 @@ public class BlockBase extends Block{ return EnumRarity.COMMON; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta){ return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); @@ -68,6 +71,7 @@ public class BlockBase extends Block{ return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty()); } + @Nonnull @Override protected BlockStateContainer createBlockState(){ return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty()); 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 54b6bc22a..6ac5d937a 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 @@ -21,9 +21,11 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class BlockBushBase extends BlockBush{ - private String name; + private final String name; public BlockBushBase(String name){ this.name = name; @@ -58,6 +60,7 @@ public class BlockBushBase extends BlockBush{ return EnumRarity.COMMON; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta){ return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); @@ -68,6 +71,7 @@ public class BlockBushBase extends BlockBush{ return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty()); } + @Nonnull @Override protected BlockStateContainer createBlockState(){ return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty()); 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 e2469b7c3..0cce99e9f 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 @@ -40,12 +40,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.IFluidHandler; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Random; public abstract class BlockContainerBase extends BlockContainer{ - private String name; + private final String name; public BlockContainerBase(Material material, String name){ super(material); @@ -101,9 +102,6 @@ public abstract class BlockContainerBase extends BlockContainer{ float dY = Util.RANDOM.nextFloat()*0.8F+0.1F; float dZ = Util.RANDOM.nextFloat()*0.8F+0.1F; EntityItem entityItem = new EntityItem(world, pos.getX()+dX, pos.getY()+dY, pos.getZ()+dZ, stack.copy()); - if(stack.hasTagCompound()){ - entityItem.getEntityItem().setTagCompound((NBTTagCompound)stack.getTagCompound().copy()); - } float factor = 0.05F; entityItem.motionX = Util.RANDOM.nextGaussian()*factor; entityItem.motionY = Util.RANDOM.nextGaussian()*factor+0.2F; @@ -131,6 +129,7 @@ public abstract class BlockContainerBase extends BlockContainer{ return false; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta){ return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta); @@ -152,8 +151,8 @@ public abstract class BlockContainerBase extends BlockContainer{ } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock){ - this.updateRedstoneState(world, pos); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){ + this.updateRedstoneState(worldIn, pos); } public void updateRedstoneState(World world, BlockPos pos){ @@ -175,8 +174,8 @@ public abstract class BlockContainerBase extends BlockContainer{ } } - protected boolean tryUseItemOnTank(EntityPlayer player, ItemStack heldItem, EnumFacing sideHit, IFluidHandler tank){ - return heldItem != null && FluidUtil.interactWithTank(heldItem, player, tank, sideHit); + protected boolean checkFailUseItemOnTank(EntityPlayer player, ItemStack heldItem, EnumFacing sideHit, IFluidHandler tank){ + return heldItem == null || !FluidUtil.interactWithTank(heldItem, player, tank, sideHit); } @Override @@ -238,13 +237,15 @@ public abstract class BlockContainerBase extends BlockContainer{ return 0; } + @Nonnull @Override protected BlockStateContainer createBlockState(){ return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty()); } + @Nonnull @Override - public ArrayList getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ + public ArrayList getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ ArrayList drops = new ArrayList(); TileEntity tile = world.getTileEntity(pos); @@ -290,6 +291,7 @@ public abstract class BlockContainerBase extends BlockContainer{ return null; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state){ return EnumBlockRenderType.MODEL; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 71ca2925d..88c09b438 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -24,7 +24,7 @@ import net.minecraftforge.fluids.Fluid; public class BlockFluidFlowing extends BlockFluidClassic{ - private String name; + private final String name; public BlockFluidFlowing(Fluid fluid, Material material, String unlocalizedName){ super(fluid, material); 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 a70e503ab..10df827ff 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 @@ -27,6 +27,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -35,9 +36,9 @@ public class BlockPlant extends BlockCrops{ public Item seedItem; public Item returnItem; public int returnMeta; - private String name; - private int minDropAmount; - private int addDropAmount; + private final String name; + private final int minDropAmount; + private final int addDropAmount; public BlockPlant(String name, int minDropAmount, int addDropAmount){ this.name = name; @@ -72,6 +73,7 @@ public class BlockPlant extends BlockCrops{ return EnumRarity.RARE; } + @Nonnull @Override public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos){ return EnumPlantType.Crop; @@ -110,16 +112,18 @@ public class BlockPlant extends BlockCrops{ return false; } + @Nonnull @Override public Item getSeed(){ return this.seedItem; } @Override - public int quantityDropped(IBlockState state, int fortune, Random random){ + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random){ return this.getMetaFromState(state) >= 7 ? random.nextInt(this.addDropAmount)+this.minDropAmount : super.quantityDropped(state, fortune, random); } + @Nonnull @Override public Item getCrop(){ return this.returnItem; @@ -127,7 +131,7 @@ public class BlockPlant extends BlockCrops{ @Override - public Item getItemDropped(IBlockState state, Random rand, int par3){ + public Item getItemDropped(@Nonnull IBlockState state, Random rand, int par3){ return this.getMetaFromState(state) >= 7 ? this.getCrop() : this.getSeed(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index ef049fd32..fb2866844 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack; public class BlockStair extends BlockStairs{ - private String name; + private final String name; public BlockStair(Block block, String name){ this(block, name, 0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java index 3316ae28f..6f28797d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java @@ -16,6 +16,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemBlockBase extends ItemBlock{ public ItemBlockBase(Block block){ @@ -24,6 +26,7 @@ public class ItemBlockBase extends ItemBlock{ this.setMaxDamage(0); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -34,6 +37,7 @@ public class ItemBlockBase extends ItemBlock{ return damage; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ if(this.block instanceof BlockBase){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java index b8a3ab6bb..1635ea37d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java @@ -31,7 +31,7 @@ public enum TheColoredLampColors{ RED("Red"), BLACK("Black"); - public String name; + public final String name; TheColoredLampColors(String name){ this.name = name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java index d3d1557a8..ebf7228d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java @@ -19,10 +19,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; + public class RenderCompost extends TileEntitySpecialRenderer{ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage){ + public void renderTileEntityAt(@Nonnull TileEntity te, double x, double y, double z, float partialTicks, int destroyStage){ if(te instanceof TileEntityCompost){ TileEntityCompost compost = (TileEntityCompost)te; if(compost.getStackInSlot(0) != null){ 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 24d749c32..70b76ec27 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 @@ -20,10 +20,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; + public class RenderReconstructorLens extends TileEntitySpecialRenderer{ @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ + public void renderTileEntityAt(@Nonnull TileEntity tile, double x, double y, double z, float par5, int par6){ if(!(tile instanceof TileEntityAtomicReconstructor)){ return; } 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 02a9a3b74..2ba524ac3 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 @@ -21,12 +21,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; import java.util.Locale; public class RenderSmileyCloud extends TileEntitySpecialRenderer{ @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int partial){ + public void renderTileEntityAt(@Nonnull TileEntity tile, double x, double y, double z, float par5, int partial){ if(tile instanceof TileEntitySmileyCloud){ TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java index 4f88d88c3..93c7d33f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java @@ -270,10 +270,10 @@ public class BookletUtils{ IndexButton button = (IndexButton)booklet.chapterButtons[i]; if(entry == null){ if(i >= GuiBooklet.INDEX_BUTTONS_OFFSET){ - boolean entryExists = ActuallyAdditionsAPI.bookletEntries.size() > i-GuiBooklet.INDEX_BUTTONS_OFFSET; + boolean entryExists = ActuallyAdditionsAPI.BOOKLET_ENTRIES.size() > i-GuiBooklet.INDEX_BUTTONS_OFFSET; button.visible = entryExists; if(entryExists){ - button.displayString = "◦ "+ActuallyAdditionsAPI.bookletEntries.get(i-GuiBooklet.INDEX_BUTTONS_OFFSET).getLocalizedNameWithFormatting(); + button.displayString = "◦ "+ActuallyAdditionsAPI.BOOKLET_ENTRIES.get(i-GuiBooklet.INDEX_BUTTONS_OFFSET).getLocalizedNameWithFormatting(); button.chap = null; } } @@ -308,8 +308,8 @@ public class BookletUtils{ } } else{ - if(place-GuiBooklet.INDEX_BUTTONS_OFFSET < ActuallyAdditionsAPI.bookletEntries.size()){ - openIndexEntry(booklet, ActuallyAdditionsAPI.bookletEntries.get(place-GuiBooklet.INDEX_BUTTONS_OFFSET), 1, true); + if(place-GuiBooklet.INDEX_BUTTONS_OFFSET < ActuallyAdditionsAPI.BOOKLET_ENTRIES.size()){ + openIndexEntry(booklet, ActuallyAdditionsAPI.BOOKLET_ENTRIES.get(place-GuiBooklet.INDEX_BUTTONS_OFFSET), 1, true); } } } @@ -431,7 +431,7 @@ public class BookletUtils{ public static ArrayList getPagesForStack(ItemStack stack){ ArrayList possiblePages = new ArrayList(); - for(BookletPage page : ActuallyAdditionsAPI.bookletPagesWithItemStackData){ + for(BookletPage page : ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_DATA){ if(ItemUtil.contains(page.getItemStacksForPage(), stack, page.arePageStacksWildcard)){ possiblePages.add(page); } 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 117f5fa25..b46478423 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java @@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; -import net.minecraft.stats.StatFileWriter; +import net.minecraft.stats.StatisticsManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; /** @@ -22,8 +22,8 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; */ public class GuiAAAchievements extends GuiAchievements{ - public GuiAAAchievements(GuiScreen screen, StatFileWriter writer){ - super(screen, writer); + public GuiAAAchievements(GuiScreen screen, StatisticsManager statistics){ + super(screen, statistics); try{ ReflectionHelper.setPrivateValue(GuiAchievements.class, this, InitAchievements.pageNumber, 20); } 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 f2bf68080..43f922449 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -45,6 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -61,11 +62,11 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ public static final int CHAPTER_BUTTONS_AMOUNT = 13; public static final int INDEX_BUTTONS_OFFSET = 3; private static final int[] AND_HIS_NAME_IS = new int[]{Keyboard.KEY_C, Keyboard.KEY_E, Keyboard.KEY_N, Keyboard.KEY_A}; - public int xSize; - public int ySize; + public final int xSize; + public final int ySize; public int guiLeft; public int guiTop; - public IEntrySet currentEntrySet = new EntrySet(null); + public final IEntrySet currentEntrySet = new EntrySet(null); public int indexPageAmount; public GuiButton buttonForward; public GuiButton buttonBackward; @@ -77,14 +78,14 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ public GuiButton buttonConfig; public GuiButton buttonWebsite; public GuiButton buttonPatreon; - public GuiButton[] chapterButtons = new GuiButton[CHAPTER_BUTTONS_AMOUNT]; - public GuiButton[] bookmarkButtons = new GuiButton[8]; + public final GuiButton[] chapterButtons = new GuiButton[CHAPTER_BUTTONS_AMOUNT]; + public final GuiButton[] bookmarkButtons = new GuiButton[8]; public GuiTextField searchField; - public GuiScreen parentScreen; + public final GuiScreen parentScreen; private int ticksElapsed; private boolean mousePressed; - private boolean tryOpenMainPage; - private boolean saveOnClose; + private final boolean tryOpenMainPage; + private final boolean saveOnClose; private int hisNameIsAt; public GuiBooklet(GuiScreen parentScreen, boolean tryOpenMainPage, boolean saveOnClose){ @@ -197,7 +198,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ } @Override - public void drawHoveringText(List list, int x, int y){ + public void drawHoveringText(@Nonnull List list, int x, int y){ super.drawHoveringText(list, x, y); } @@ -440,7 +441,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ list.add(from.getClickToSeeRecipeString()); if(mousePressed){ - BookletUtils.openIndexEntry(this, page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); + BookletUtils.openIndexEntry(this, page.getChapter().getEntry(), ActuallyAdditionsAPI.BOOKLET_ENTRIES.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openChapter(this, page.getChapter(), page); Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index ef38bf9ab..3eabe4441 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -31,7 +31,6 @@ import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.tile.*; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.fml.common.Loader; 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 56358ea88..658f5dd65 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 @@ -22,13 +22,14 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import javax.annotation.Nonnull; import java.util.ArrayList; public class BookmarkButton extends GuiButton{ public EntrySet assignedEntry = new EntrySet(null); - private GuiBooklet booklet; + private final GuiBooklet booklet; public BookmarkButton(int id, int x, int y, GuiBooklet booklet){ super(id, x, y, 16, 16, ""); @@ -53,7 +54,7 @@ public class BookmarkButton extends GuiButton{ } @Override - public void drawButton(Minecraft minecraft, int x, int y){ + public void drawButton(@Nonnull Minecraft minecraft, int x, int y){ if(this.visible){ minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); 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 76e39663a..5228f43b4 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 @@ -21,10 +21,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; +import javax.annotation.Nonnull; + public class IndexButton extends GuiButton{ public IBookletChapter chap; - private GuiBooklet gui; + private final GuiBooklet gui; public IndexButton(int id, int x, int y, int width, int height, String text, GuiBooklet gui){ super(id, x, y, width, height, text); @@ -32,7 +34,7 @@ public class IndexButton extends GuiButton{ } @Override - public void drawButton(Minecraft minecraft, int mouseX, int mouseY){ + public void drawButton(@Nonnull Minecraft minecraft, int mouseX, int mouseY){ if(this.visible){ 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; 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 de8815d21..9f1eb03a0 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 @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -23,7 +24,7 @@ public class TexturedButton extends GuiButton{ public int texturePosX; public int texturePosY; - public List textList = new ArrayList(); + public final List textList = new ArrayList(); public TexturedButton(int id, int x, int y, int texturePosX, int texturePosY, int width, int height){ this(id, x, y, texturePosX, texturePosY, width, height, new ArrayList()); @@ -43,7 +44,7 @@ public class TexturedButton extends GuiButton{ } @Override - public void drawButton(Minecraft minecraft, int x, int y){ + public void drawButton(@Nonnull Minecraft minecraft, int x, int y){ if(this.visible){ minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java index 8c095d393..eabe46a6a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java @@ -75,14 +75,12 @@ public class BookletChapter implements IBookletChapter{ return this.displayStack; } - public BookletChapter setIncomplete(){ + public void setIncomplete(){ this.isIncomplete = true; - return this; } - public BookletChapter setImportant(){ + public void setImportant(){ this.color = TextFormatting.DARK_GREEN; - return this; } public BookletChapter setSpecial(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java index 414840b8f..1a381fd22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java @@ -33,7 +33,7 @@ public class BookletChapterCoffee extends BookletChapter{ ArrayList allPages = new ArrayList(); allPages.addAll(Arrays.asList(pages)); - for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.coffeeMachineIngredients){ + for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS){ BookletPageAA page = new PageCoffeeRecipe(allPages.size()+1, ingredient); if(!(ingredient instanceof ItemCoffee.MilkIngredient)){ page.setNoText(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java index 5ccb632f7..1c47892fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java @@ -39,7 +39,7 @@ public class EntrySet implements IEntrySet{ int chapter = compound.getInteger("Chapter"); int page = compound.getInteger("Page"); - IBookletEntry currentEntry = entry == -1 ? null : ActuallyAdditionsAPI.bookletEntries.get(entry); + IBookletEntry currentEntry = entry == -1 ? null : ActuallyAdditionsAPI.BOOKLET_ENTRIES.get(entry); IBookletChapter currentChapter = chapter == -1 || entry == -1 || currentEntry.getChapters().size() <= chapter ? null : currentEntry.getChapters().get(chapter); BookletPage currentPage = chapter == -1 || currentChapter == null || currentChapter.getPages().length <= page-1 ? null : currentChapter.getPages()[page-1]; int pageInIndex = compound.getInteger("PageInIndex"); @@ -66,7 +66,7 @@ public class EntrySet implements IEntrySet{ @Override public NBTTagCompound writeToNBT(){ NBTTagCompound compound = new NBTTagCompound(); - compound.setInteger("Entry", this.entry == null ? -1 : ActuallyAdditionsAPI.bookletEntries.indexOf(this.entry)); + compound.setInteger("Entry", this.entry == null ? -1 : ActuallyAdditionsAPI.BOOKLET_ENTRIES.indexOf(this.entry)); compound.setInteger("Chapter", this.entry == null || this.chapter == null ? -1 : this.entry.getChapters().indexOf(this.chapter)); compound.setInteger("Page", this.page == null ? -1 : this.page.getID()); compound.setInteger("PageInIndex", this.pageInIndex); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java index e697dc69b..6d32993e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java @@ -24,8 +24,8 @@ import java.util.Map; public class BookletPageAA extends BookletPage{ - protected int localizationKey; - private HashMap textReplacements = new HashMap(); + protected final int localizationKey; + private final HashMap textReplacements = new HashMap(); private boolean hasNoText; public BookletPageAA(int localizationKey){ @@ -98,7 +98,7 @@ public class BookletPageAA extends BookletPage{ } public void addToPagesWithItemStackData(){ - if(!ActuallyAdditionsAPI.bookletPagesWithItemStackData.contains(this)){ + if(!ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_DATA.contains(this)){ ItemStack[] stacks = this.getItemStacksForPage(); if(stacks != null && stacks.length > 0){ //Ensure that there is at least one ItemStack diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java index 09da186f1..67f7005c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class PageCoffeeRecipe extends BookletPageAA{ - public CoffeeIngredient ingredient; + public final CoffeeIngredient ingredient; public PageCoffeeRecipe(int id, CoffeeIngredient ingredient){ super(id); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java index 429dc35ea..f54d35e46 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java @@ -29,7 +29,7 @@ import java.util.List; public class PageCrusherRecipe extends BookletPageAA{ - public CrusherRecipe recipe; + public final CrusherRecipe recipe; private int recipePos; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java index 5ecdf1136..05cbe904b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java @@ -20,8 +20,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class PagePicture extends PageTextOnly{ - private ResourceLocation resLoc; - private int textStartY; + private final ResourceLocation resLoc; + private final int textStartY; public PagePicture(int id, String resLocName, int textStartY){ super(id); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java index 6f525382d..d32249837 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java @@ -30,7 +30,7 @@ import java.util.List; public class PageReconstructor extends BookletPageAA{ - private LensConversionRecipe[] recipes; + private final LensConversionRecipe[] recipes; private int recipePos; public PageReconstructor(int id, ArrayList recipes){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java index e66a3410e..e36ed5191 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java @@ -17,9 +17,9 @@ import net.minecraftforge.common.config.Configuration; public class ConfigValues{ - public static ConfigCrafting[] craftingConfig = ConfigCrafting.values(); - public static ConfigIntValues[] intConfig = ConfigIntValues.values(); - public static ConfigBoolValues[] boolConfig = ConfigBoolValues.values(); + public static final ConfigCrafting[] CRAFTING_CONFIG = ConfigCrafting.values(); + public static final ConfigIntValues[] INT_CONFIG = ConfigIntValues.values(); + public static final ConfigBoolValues[] BOOL_CONFIG = ConfigBoolValues.values(); public static String[] crusherRecipeExceptions; public static String[] mashedFoodCraftingExceptions; @@ -45,13 +45,13 @@ public class ConfigValues{ public static void defineConfigValues(Configuration config){ - for(ConfigCrafting currConf : craftingConfig){ + for(ConfigCrafting currConf : CRAFTING_CONFIG){ currConf.currentValue = config.get(currConf.category, currConf.name, currConf.defaultValue, "If the Recipe for the "+currConf.name+" is Enabled").getBoolean(); } - for(ConfigIntValues currConf : intConfig){ + for(ConfigIntValues currConf : INT_CONFIG){ currConf.currentValue = config.get(currConf.category, currConf.name, currConf.defaultValue, currConf.desc, currConf.min, currConf.max).getInt(); } - for(ConfigBoolValues currConf : boolConfig){ + for(ConfigBoolValues currConf : BOOL_CONFIG){ currConf.currentValue = config.get(currConf.category, currConf.name, currConf.defaultValue, currConf.desc).getBoolean(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 4b3a1315e..635a7feae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -71,7 +71,7 @@ public class BlockCrafting{ public static IRecipe recipeCrate; public static IRecipe recipeFermentingBarrel; public static IRecipe recipeCanolaPress; - public static IRecipe[] recipesLamps = new IRecipe[BlockColoredLamp.allLampTypes.length]; + public static final IRecipe[] recipesLamps = new IRecipe[BlockColoredLamp.allLampTypes.length]; public static IRecipe recipePowerer; public static IRecipe recipeLeafGen; public static IRecipe recipeDirectionalBreaker; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java index defb2b03e..fa9b7351f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java @@ -32,7 +32,7 @@ public class CrusherCrafting{ public static CrusherRecipe recipeIronHorseArmor; public static CrusherRecipe recipeGoldHorseArmor; public static CrusherRecipe recipeDiamondHorseArmor; - public static ArrayList miscRecipes = new ArrayList(); + public static final ArrayList miscRecipes = new ArrayList(); public static void init(){ ModUtil.LOGGER.info("Initializing Crusher Recipes..."); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 5e3065495..96aa5213d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -44,9 +44,9 @@ public class ItemCrafting{ public static IRecipe recipeBook; public static IRecipe recipeTinyCoal; public static IRecipe recipeTinyChar; - public static ArrayList recipesMashedFood = new ArrayList(); + public static final ArrayList recipesMashedFood = new ArrayList(); public static IRecipe recipeDrill; - public static ArrayList recipesDrillColoring = new ArrayList(); + public static final ArrayList recipesDrillColoring = new ArrayList(); public static IRecipe recipeDrillSpeedI; public static IRecipe recipeDrillSpeedII; public static IRecipe recipeDrillSpeedIII; @@ -75,7 +75,7 @@ public class ItemCrafting{ public static IRecipe recipeRiceDough; public static IRecipe recipeLeafBlower; public static IRecipe recipeLeafBlowerAdvanced; - public static ArrayList recipesPotionRings = new ArrayList(); + public static final ArrayList recipesPotionRings = new ArrayList(); public static IRecipe recipeChestToCrateUpgrade; public static IRecipe recipeLaserWrench; public static IRecipe recipeDrillCore; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java index 7cc54cd64..7d21de824 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java @@ -26,8 +26,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class MiscCrafting{ - public static IRecipe[] recipesCrystals = new IRecipe[TheCrystals.values().length]; - public static IRecipe[] recipesCrystalBlocks = new IRecipe[TheCrystals.values().length]; + public static final IRecipe[] recipesCrystals = new IRecipe[TheCrystals.values().length]; + public static final IRecipe[] recipesCrystalBlocks = new IRecipe[TheCrystals.values().length]; public static void init(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java index fd67cf182..f86e9443f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java @@ -28,7 +28,7 @@ import java.util.ArrayList; public class ToolCrafting{ - public static ArrayList recipesPaxels = new ArrayList(); + public static final ArrayList recipesPaxels = new ArrayList(); public static void init(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index fce687f15..6255fffa8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -25,22 +25,25 @@ import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class CreativeTab extends CreativeTabs{ - public static CreativeTab instance = new CreativeTab(); + public static final CreativeTab instance = new CreativeTab(); private List list; public CreativeTab(){ super(ModUtil.MOD_ID); } + @Nonnull @Override public ItemStack getIconItemStack(){ return new ItemStack(this.getTabIconItem()); } + @Nonnull @Override public Item getTabIconItem(){ return InitItems.itemBooklet; @@ -48,7 +51,7 @@ public class CreativeTab extends CreativeTabs{ @Override @SideOnly(Side.CLIENT) - public void displayAllRelevantItems(List list){ + public void displayAllRelevantItems(@Nonnull List list){ this.list = list; this.add(InitItems.itemBooklet); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java index 21c0f808f..e5c48ab95 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java @@ -22,7 +22,7 @@ import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.BiomeGenOcean; +import net.minecraft.world.biome.BiomeOcean; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -48,9 +48,9 @@ public class WorldDecorationEvent{ BlockPos randomPos = new BlockPos(event.getPos().getX()+event.getRand().nextInt(16)+8, 0, event.getPos().getZ()+event.getRand().nextInt(16)+8); randomPos = event.getWorld().getTopSolidOrLiquidBlock(randomPos); - if(event.getWorld().getBiomeGenForCoords(randomPos) instanceof BiomeGenOcean){ + if(event.getWorld().getBiomeGenForCoords(randomPos) instanceof BiomeOcean){ if(randomPos.getY() >= 25 && randomPos.getY() <= 45){ - if(PosUtil.getBlock(randomPos, event.getWorld()).getMaterial(event.getWorld().getBlockState(randomPos)) == Material.WATER){ + if(event.getWorld().getBlockState(randomPos).getMaterial() == Material.WATER){ if(PosUtil.getMaterial(PosUtil.offset(randomPos, 0, -1, 0), event.getWorld()).isSolid()){ PosUtil.setBlock(randomPos, event.getWorld(), InitBlocks.blockTreasureChest, event.getRand().nextInt(4), 2); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java index e64951714..7cf052655 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java @@ -25,7 +25,7 @@ import java.util.Random; public class JamVillagerTradeHandler{ - private ArrayList trades = new ArrayList(); + private final ArrayList trades = new ArrayList(); public JamVillagerTradeHandler(){ this.addWants("ingotGold", 5, 7); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java index f1f0110d6..d5b9d7cae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java @@ -21,6 +21,7 @@ import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -48,7 +49,7 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous } @Override - public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){ + public boolean addComponentParts(@Nonnull World world, @Nonnull Random rand, @Nonnull StructureBoundingBox sbb){ if(this.averageGroundLevel < 0){ this.averageGroundLevel = this.getAverageGroundLevel(world, sbb); if(this.averageGroundLevel < 0){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java index ae103bbfd..f093c32f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java @@ -21,6 +21,7 @@ import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -48,7 +49,7 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{ } @Override - public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){ + public boolean addComponentParts(@Nonnull World world, @Nonnull Random rand, @Nonnull StructureBoundingBox sbb){ if(this.averageGroundLevel < 0){ this.averageGroundLevel = this.getAverageGroundLevel(world, sbb); if(this.averageGroundLevel < 0){ @@ -186,7 +187,7 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{ //Loot Chest this.setBlockState(world, Blocks.CHEST.getDefaultState(), 8, 1, 6, sbb); - TileEntity chest = world.getTileEntity(new BlockPos(this.getXWithOffset(8, 6), this.getYWithOffset(1), this.getZWithOffset(8, 6))); + //TileEntity chest = world.getTileEntity(new BlockPos(this.getXWithOffset(8, 6), this.getYWithOffset(1), this.getZWithOffset(8, 6))); //TODO Chest content /*if(chest != null && chest instanceof TileEntityChest){ WeightedRandomChestContent.generateChestContents(rand, ChestGenHooks.getItems(InitVillager.JAM_HOUSE_CHEST_NAME, rand), (TileEntityChest)chest, ChestGenHooks.getCount(InitVillager.JAM_HOUSE_CHEST_NAME, rand)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/CaveWorldType.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/CaveWorldType.java index 46dd77996..7b7076025 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/CaveWorldType.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/CaveWorldType.java @@ -27,6 +27,8 @@ import net.minecraft.world.chunk.IChunkGenerator; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import javax.annotation.Nonnull; + public class CaveWorldType extends WorldType{ public CaveWorldType(){ @@ -40,13 +42,14 @@ public class CaveWorldType extends WorldType{ return ConfigValues.caveWorld && world.getWorldType() instanceof CaveWorldType; } + @Nonnull @Override - public IChunkGenerator getChunkGenerator(World world, String generatorOptions){ + public IChunkGenerator getChunkGenerator(@Nonnull World world, String generatorOptions){ return new ChunkProviderCave(world); } @Override - public int getSpawnFuzz(WorldServer world, MinecraftServer server){ + public int getSpawnFuzz(@Nonnull WorldServer world, MinecraftServer server){ return 1; } @@ -57,7 +60,7 @@ public class CaveWorldType extends WorldType{ if(isCave(player.worldObj) && !player.worldObj.isRemote){ if(player.posY >= player.worldObj.getHeight() && !player.isSpectator()){ BlockPos spawn = player.worldObj.getSpawnPoint(); - player.playerNetServerHandler.setPlayerLocation(spawn.getX()+0.5, spawn.getY()+1, spawn.getZ()+0.5, player.rotationYaw, player.rotationPitch); + player.connection.setPlayerLocation(spawn.getX()+0.5, spawn.getY()+1, spawn.getZ()+0.5, player.rotationYaw, player.rotationPitch); } NBTTagCompound playerData = PersistentServerData.getDataFromPlayer(player); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java index d0a987917..f9f197639 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java @@ -14,22 +14,24 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.gen.feature.WorldGenerator; +import javax.annotation.Nonnull; +import java.util.Collections; import java.util.List; import java.util.Random; public class ChunkProviderCave implements IChunkGenerator{ private boolean generatedSpawn; - private World world; - private Random rand; + private final World world; + private final Random rand; - private WorldGenerator spawnGenerator; + private final WorldGenerator spawnGenerator; public ChunkProviderCave(World world){ this.world = world; @@ -37,6 +39,7 @@ public class ChunkProviderCave implements IChunkGenerator{ this.spawnGenerator = new WorldGenCaveSpawn(this.rand); } + @Nonnull @Override public Chunk provideChunk(int chunkX, int chunkZ){ ChunkPrimer primer = new ChunkPrimer(); @@ -81,22 +84,23 @@ public class ChunkProviderCave implements IChunkGenerator{ } @Override - public boolean generateStructures(Chunk chunkIn, int x, int z){ + public boolean generateStructures(@Nonnull Chunk chunkIn, int x, int z){ return false; } + @Nonnull @Override - public List getPossibleCreatures(EnumCreatureType creatureType, BlockPos pos){ + public List getPossibleCreatures(@Nonnull EnumCreatureType creatureType, @Nonnull BlockPos pos){ + return Collections.emptyList(); + } + + @Override + public BlockPos getStrongholdGen(@Nonnull World worldIn, @Nonnull String structureName, @Nonnull BlockPos position){ return null; } @Override - public BlockPos getStrongholdGen(World worldIn, String structureName, BlockPos position){ - return null; - } - - @Override - public void recreateStructures(Chunk chunkIn, int x, int z){ + public void recreateStructures(@Nonnull Chunk chunkIn, int x, int z){ } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/WorldGenCaveSpawn.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/WorldGenCaveSpawn.java index e1b242560..ca5441409 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/WorldGenCaveSpawn.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/WorldGenCaveSpawn.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.gen.cave; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.BlockLadder; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -25,18 +24,19 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; +import javax.annotation.Nonnull; import java.util.Random; public class WorldGenCaveSpawn extends WorldGenerator{ - private Random rand; + private final Random rand; public WorldGenCaveSpawn(Random rand){ this.rand = rand; } @Override - public boolean generate(World world, Random rand, BlockPos position){ + public boolean generate(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos position){ this.generateCave(world, position); return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java index ff7d973be..ec94a585f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java @@ -18,10 +18,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerBreaker extends Container{ - private TileEntityBreaker breaker; + private final TileEntityBreaker breaker; public ContainerBreaker(InventoryPlayer inventory, TileEntityBase tile){ this.breaker = (TileEntityBreaker)tile; @@ -92,7 +94,7 @@ public class ContainerBreaker extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.breaker.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java index 98e6f994f..d0020e9fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java @@ -21,10 +21,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerCanolaPress extends Container{ - private TileEntityCanolaPress press; + private final TileEntityCanolaPress press; public ContainerCanolaPress(InventoryPlayer inventory, TileEntityBase tile){ this.press = (TileEntityCanolaPress)tile; @@ -95,7 +97,7 @@ public class ContainerCanolaPress extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.press.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java index 6580ec0d7..596638fd0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java @@ -20,10 +20,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +import javax.annotation.Nonnull; + public class ContainerCoalGenerator extends Container{ - private TileEntityCoalGenerator generator; + private final TileEntityCoalGenerator generator; public ContainerCoalGenerator(InventoryPlayer inventory, TileEntityBase tile){ this.generator = (TileEntityCoalGenerator)tile; @@ -94,7 +96,7 @@ public class ContainerCoalGenerator extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.generator.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java index 8b480ec04..235f4b4b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java @@ -23,10 +23,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerCoffeeMachine extends Container{ - private TileEntityCoffeeMachine machine; + private final TileEntityCoffeeMachine machine; public ContainerCoffeeMachine(InventoryPlayer inventory, TileEntityBase tile){ this.machine = (TileEntityCoffeeMachine)tile; @@ -122,7 +124,7 @@ public class ContainerCoffeeMachine extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.machine.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java index f8436c4d0..e6b37aef7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java @@ -18,23 +18,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ContainerCrafter extends Container{ - public final int x; - public final int y; - public final int z; public final World world; - public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); - public IInventory craftResult = new InventoryCraftResult(); + public final InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); + public final IInventory craftResult = new InventoryCraftResult(); public ContainerCrafter(EntityPlayer player){ InventoryPlayer inventory = player.inventory; this.world = player.worldObj; - this.x = (int)player.posX; - this.y = (int)player.posY; - this.z = (int)player.posZ; this.addSlotToContainer(new SlotCrafting(inventory.player, this.craftMatrix, this.craftResult, 0, 124, 35)); for(int i = 0; i < 3; i++){ @@ -116,7 +112,7 @@ public class ContainerCrafter extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return true; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java index cbfa01211..1faf5652c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDirectionalBreaker extends Container{ - private TileEntityDirectionalBreaker breaker; + private final TileEntityDirectionalBreaker breaker; public ContainerDirectionalBreaker(InventoryPlayer inventory, TileEntityBase tile){ this.breaker = (TileEntityDirectionalBreaker)tile; @@ -93,7 +95,7 @@ public class ContainerDirectionalBreaker extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.breaker.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index cecb638a8..64c38e872 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -26,13 +26,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import javax.annotation.Nonnull; + public class ContainerDrill extends Container{ public static final int SLOT_AMOUNT = 5; - private InventoryDrill drillInventory = new InventoryDrill(); - private InventoryPlayer inventory; + private final InventoryDrill drillInventory = new InventoryDrill(); + private final InventoryPlayer inventory; public ContainerDrill(InventoryPlayer inventory){ this.inventory = inventory; @@ -142,7 +144,7 @@ public class ContainerDrill extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.drillInventory.isUseableByPlayer(player); } @@ -150,6 +152,7 @@ public class ContainerDrill extends Container{ public ItemStack[] slots = new ItemStack[SLOT_AMOUNT]; + @Nonnull @Override public String getName(){ return "drill"; @@ -166,22 +169,22 @@ public class ContainerDrill extends Container{ } @Override - public boolean isUseableByPlayer(EntityPlayer player){ + public boolean isUseableByPlayer(@Nonnull EntityPlayer player){ return true; } @Override - public void openInventory(EntityPlayer player){ + public void openInventory(@Nonnull EntityPlayer player){ } @Override - public void closeInventory(EntityPlayer player){ + public void closeInventory(@Nonnull EntityPlayer player){ } @Override - public boolean isItemValidForSlot(int index, ItemStack stack){ + public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ return true; } @@ -259,6 +262,7 @@ public class ContainerDrill extends Container{ return false; } + @Nonnull @Override public ITextComponent getDisplayName(){ return new TextComponentString(StringUtil.localize(this.getName())); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java index d46f03f34..ab732dce6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDropper extends Container{ - private TileEntityDropper dropper; + private final TileEntityDropper dropper; public ContainerDropper(InventoryPlayer inventory, TileEntityBase tile){ this.dropper = (TileEntityDropper)tile; @@ -93,7 +95,7 @@ public class ContainerDropper extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.dropper.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 56eacee7e..875f78e28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -25,11 +25,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ContainerEnergizer extends Container{ public static final EntityEquipmentSlot[] VALID_EQUIPMENT_SLOTS = new EntityEquipmentSlot[]{EntityEquipmentSlot.HEAD, EntityEquipmentSlot.CHEST, EntityEquipmentSlot.LEGS, EntityEquipmentSlot.FEET}; - private TileEntityEnergizer energizer; + private final TileEntityEnergizer energizer; public ContainerEnergizer(final EntityPlayer player, TileEntityBase tile){ this.energizer = (TileEntityEnergizer)tile; @@ -130,7 +132,7 @@ public class ContainerEnergizer extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.energizer.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index db8b79995..7587010ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -25,10 +25,12 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ContainerEnervator extends Container{ - private TileEntityEnervator enervator; + private final TileEntityEnervator enervator; public ContainerEnervator(final EntityPlayer player, TileEntityBase tile){ this.enervator = (TileEntityEnervator)tile; @@ -129,7 +131,7 @@ public class ContainerEnervator extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.enervator.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java index 7fa1a5620..6f610228d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerFeeder extends Container{ - private TileEntityFeeder tileFeeder; + private final TileEntityFeeder tileFeeder; public ContainerFeeder(InventoryPlayer inventory, TileEntityBase tile){ this.tileFeeder = (TileEntityFeeder)tile; @@ -88,7 +90,7 @@ public class ContainerFeeder extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileFeeder.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java index 418499da6..6b56d6a9e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerFermentingBarrel extends Container{ - private TileEntityFermentingBarrel barrel; + private final TileEntityFermentingBarrel barrel; public ContainerFermentingBarrel(InventoryPlayer inventory, TileEntityBase tile){ this.barrel = (TileEntityFermentingBarrel)tile; @@ -83,7 +85,7 @@ public class ContainerFermentingBarrel extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.barrel.canPlayerUse(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java index a9aef28d0..38197a535 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerFluidCollector extends Container{ - private TileEntityFluidCollector collector; + private final TileEntityFluidCollector collector; public ContainerFluidCollector(InventoryPlayer inventory, TileEntityBase tile){ this.collector = (TileEntityFluidCollector)tile; @@ -90,7 +92,7 @@ public class ContainerFluidCollector extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.collector.canPlayerUse(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java index 3c02b9ddd..ea521c6ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java @@ -21,10 +21,12 @@ import net.minecraft.inventory.SlotFurnaceOutput; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; +import javax.annotation.Nonnull; + public class ContainerFurnaceDouble extends Container{ - private TileEntityFurnaceDouble tileFurnace; + private final TileEntityFurnaceDouble tileFurnace; public ContainerFurnaceDouble(InventoryPlayer inventory, TileEntityBase tile){ this.tileFurnace = (TileEntityFurnaceDouble)tile; @@ -107,7 +109,7 @@ public class ContainerFurnaceDouble extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileFurnace.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java index 9a511087a..e0af7f20c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java @@ -18,9 +18,11 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerGiantChest extends Container{ - public TileEntityGiantChest tileChest; + public final TileEntityGiantChest tileChest; public ContainerGiantChest(InventoryPlayer inventory, TileEntityBase tile){ this.tileChest = (TileEntityGiantChest)tile; @@ -91,7 +93,7 @@ public class ContainerGiantChest extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileChest.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java index 456e88f88..fac800ed5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java @@ -21,12 +21,13 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; public class ContainerGrinder extends Container{ - public TileEntityGrinder tileGrinder; - private boolean isDouble; + public final TileEntityGrinder tileGrinder; + private final boolean isDouble; public ContainerGrinder(InventoryPlayer inventory, TileEntityBase tile, boolean isDouble){ this.tileGrinder = (TileEntityGrinder)tile; @@ -119,7 +120,7 @@ public class ContainerGrinder extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileGrinder.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 449402c2f..40fbea503 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -22,12 +22,14 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerInputter extends Container{ - private TileEntityInputter tileInputter; + private final TileEntityInputter tileInputter; - private boolean isAdvanced; + private final boolean isAdvanced; public ContainerInputter(InventoryPlayer inventory, TileEntityBase tile, boolean isAdvanced){ this.tileInputter = (TileEntityInputter)tile; @@ -116,7 +118,7 @@ public class ContainerInputter extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileInputter.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java index 11007e9de..51989f663 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java @@ -21,10 +21,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerLaserRelayItemWhitelist extends Container{ - private TileEntityLaserRelayItemWhitelist tile; + private final TileEntityLaserRelayItemWhitelist tile; public ContainerLaserRelayItemWhitelist(InventoryPlayer inventory, TileEntityBase tile){ this.tile = (TileEntityLaserRelayItemWhitelist)tile; @@ -104,7 +106,7 @@ public class ContainerLaserRelayItemWhitelist extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tile.canPlayerUse(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java index 1b500582f..5f8b29ba8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerMiner extends Container{ - private TileEntityMiner miner; + private final TileEntityMiner miner; public ContainerMiner(InventoryPlayer inventory, TileEntityBase tile){ this.miner = (TileEntityMiner)tile; @@ -93,7 +95,7 @@ public class ContainerMiner extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.miner.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java index 7bdacc476..316bf28f2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java @@ -18,9 +18,11 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerOilGenerator extends Container{ - private TileEntityOilGenerator generator; + private final TileEntityOilGenerator generator; public ContainerOilGenerator(InventoryPlayer inventory, TileEntityBase tile){ this.generator = (TileEntityOilGenerator)tile; @@ -81,7 +83,7 @@ public class ContainerOilGenerator extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.generator.canPlayerUse(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java index 4fc112576..a794e235f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java @@ -19,10 +19,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerPhantomPlacer extends Container{ - private TileEntityPhantomPlacer placer; + private final TileEntityPhantomPlacer placer; public ContainerPhantomPlacer(InventoryPlayer inventory, TileEntityBase tile){ this.placer = (TileEntityPhantomPlacer)tile; @@ -93,7 +95,7 @@ public class ContainerPhantomPlacer extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.placer.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java index 9060f34ff..9da06b3be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java @@ -21,10 +21,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerRangedCollector extends Container{ - private TileEntityRangedCollector collector; + private final TileEntityRangedCollector collector; public ContainerRangedCollector(InventoryPlayer inventory, TileEntityBase tile){ this.collector = (TileEntityRangedCollector)tile; @@ -111,7 +113,7 @@ public class ContainerRangedCollector extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.collector.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java index 460973a90..f3acb4d93 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java @@ -20,10 +20,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerRepairer extends Container{ - private TileEntityItemRepairer tileRepairer; + private final TileEntityItemRepairer tileRepairer; public ContainerRepairer(InventoryPlayer inventory, TileEntityBase tile){ this.tileRepairer = (TileEntityItemRepairer)tile; @@ -95,7 +97,7 @@ public class ContainerRepairer extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.tileRepairer.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java index 7e32752a8..6feb5dbfd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java @@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerSmileyCloud extends Container{ @Override @@ -22,7 +24,7 @@ public class ContainerSmileyCloud extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return true; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java index 95ce9a7f2..636407cd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java @@ -20,10 +20,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerXPSolidifier extends Container{ - private TileEntityXPSolidifier solidifier; + private final TileEntityXPSolidifier solidifier; public ContainerXPSolidifier(InventoryPlayer inventory, TileEntityBase tile){ this.solidifier = (TileEntityXPSolidifier)tile; @@ -86,7 +88,7 @@ public class ContainerXPSolidifier extends Container{ } @Override - public boolean canInteractWith(EntityPlayer player){ + public boolean canInteractWith(@Nonnull EntityPlayer player){ return this.solidifier.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java index ad62baaf1..8b3bea59a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java @@ -192,7 +192,7 @@ public class GuiHandler implements IGuiHandler{ MINER, LASER_RELAY_ITEM_WHITELIST; - public boolean checkTileEntity; + public final boolean checkTileEntity; GuiTypes(){ this(true); 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 fcc0a972b..07c5bca4c 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 @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiBreaker extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiBreaker"); - private TileEntityBreaker breaker; + private final TileEntityBreaker breaker; public GuiBreaker(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerBreaker(inventory, tile)); @@ -34,11 +34,6 @@ public class GuiBreaker extends GuiContainer{ this.ySize = 93+86; } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker.getName()); 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 9b787e683..bf66e1fe7 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 @@ -28,7 +28,7 @@ import java.util.Collections; public class GuiCanolaPress extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiCanolaPress"); - private TileEntityCanolaPress press; + private final TileEntityCanolaPress press; public GuiCanolaPress(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerCanolaPress(inventory, tile)); 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 a435052f6..edb494e16 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiCoalGenerator extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiCoalGenerator"); - private TileEntityCoalGenerator generator; + private final TileEntityCoalGenerator generator; public GuiCoalGenerator(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerCoalGenerator(inventory, tile)); 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 3194c7995..557e35275 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 @@ -34,11 +34,11 @@ import java.util.Collections; public class GuiCoffeeMachine extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiCoffeeMachine"); - private TileEntityCoffeeMachine machine; - private int x; - private int y; - private int z; - private World world; + private final TileEntityCoffeeMachine machine; + private final int x; + private final int y; + private final int z; + private final World world; public GuiCoffeeMachine(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world){ super(new ContainerCoffeeMachine(inventory, tile)); 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 e2c0ca26d..9f9465439 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiDirectionalBreaker extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiDirectionalBreaker"); - private TileEntityDirectionalBreaker breaker; + private final TileEntityDirectionalBreaker breaker; public GuiDirectionalBreaker(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerDirectionalBreaker(inventory, tile)); 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 5539a47ee..d8846d419 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 @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiDropper extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiBreaker"); - private TileEntityDropper dropper; + private final TileEntityDropper dropper; public GuiDropper(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerDropper(inventory, tile)); @@ -34,11 +34,6 @@ public class GuiDropper extends GuiContainer{ this.ySize = 93+86; } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.dropper.getName()); 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 2f080dbbb..f4054b7ab 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiEnergizer extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiEnergizer"); - private TileEntityEnergizer energizer; + private final TileEntityEnergizer energizer; public GuiEnergizer(EntityPlayer inventory, TileEntityBase tile){ super(new ContainerEnergizer(inventory, tile)); 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 a55d4bea4..5a5bae828 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiEnervator extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiEnergizer"); - private TileEntityEnervator enervator; + private final TileEntityEnervator enervator; public GuiEnervator(EntityPlayer inventory, TileEntityBase tile){ super(new ContainerEnervator(inventory, tile)); 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 9d4546013..a7a3f48c6 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 @@ -29,7 +29,7 @@ import java.util.Arrays; public class GuiFeeder extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiFeeder"); - public TileEntityFeeder tileFeeder; + public final TileEntityFeeder tileFeeder; public GuiFeeder(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerFeeder(inventory, tile)); 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 dcb6aadaf..a9318fd33 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 @@ -28,7 +28,7 @@ import java.util.Collections; public class GuiFermentingBarrel extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiFermentingBarrel"); - private TileEntityFermentingBarrel press; + private final TileEntityFermentingBarrel press; public GuiFermentingBarrel(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerFermentingBarrel(inventory, tile)); 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 2238539d5..df766a5d9 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 @@ -28,7 +28,7 @@ import java.util.Collections; public class GuiFluidCollector extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiFluidCollector"); - private TileEntityFluidCollector collector; + private final TileEntityFluidCollector collector; public GuiFluidCollector(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerFluidCollector(inventory, tile)); 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 931478215..b1cb32229 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiFurnaceDouble extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiFurnaceDouble"); - private TileEntityFurnaceDouble tileFurnace; + private final TileEntityFurnaceDouble tileFurnace; public GuiFurnaceDouble(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerFurnaceDouble(inventory, tile)); 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 dceeac866..f7de51720 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 @@ -26,7 +26,7 @@ public class GuiGiantChest extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiGiantChest"); - TileEntityGiantChest chest; + final TileEntityGiantChest chest; public GuiGiantChest(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerGiantChest(inventory, tile)); 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 d815f1c89..5e2255a3e 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 @@ -28,8 +28,8 @@ public class GuiGrinder extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiGrinder"); private static final ResourceLocation resLocDouble = AssetUtil.getGuiLocation("guiGrinderDouble"); - private TileEntityGrinder tileGrinder; - private boolean isDouble; + private final TileEntityGrinder tileGrinder; + private final boolean isDouble; public GuiGrinder(InventoryPlayer inventoryPlayer, TileEntityBase tile){ this(inventoryPlayer, tile, false); 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 0ab68f096..9dbd61e46 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 @@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -50,18 +51,18 @@ public class GuiInputter extends GuiContainer{ StringUtil.localize("info."+ModUtil.MOD_ID+".gui.west")}; private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiInputter"); private static final ResourceLocation resLocAdvanced = AssetUtil.getGuiLocation("guiInputterAdvanced"); - public TileEntityInputter tileInputter; - private int x; - private int y; - private int z; - private World world; + public final TileEntityInputter tileInputter; + private final int x; + private final int y; + private final int z; + private final World world; private SmallerButton whitelistPut; private SmallerButton whitelistPull; private GuiTextField fieldPutStart; private GuiTextField fieldPutEnd; private GuiTextField fieldPullStart; private GuiTextField fieldPullEnd; - private boolean isAdvanced; + private final boolean isAdvanced; public GuiInputter(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world, boolean isAdvanced){ super(new ContainerInputter(inventory, tile, isAdvanced)); @@ -278,7 +279,7 @@ public class GuiInputter extends GuiContainer{ } @Override - public void drawButton(Minecraft mc, int x, int y){ + public void drawButton(@Nonnull Minecraft mc, int x, int y){ if(this.visible){ mc.getTextureManager().bindTexture(this.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); @@ -315,7 +316,7 @@ public class GuiInputter extends GuiContainer{ } @Override - public void drawButton(Minecraft mc, int x, int y){ + public void drawButton(@Nonnull Minecraft mc, int x, int y){ if(this.visible){ mc.getTextureManager().bindTexture(this.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index bbd77098f..c084879e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -37,7 +37,7 @@ import java.util.List; public class GuiLaserRelayItemWhitelist extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiLaserRelayItemWhitelist"); - private TileEntityLaserRelayItemWhitelist tile; + private final TileEntityLaserRelayItemWhitelist tile; private SmallerButton whitelistLeft; private SmallerButton whitelistRight; 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 caf811bbe..331939d08 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 @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiMiner extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiBreaker"); - private TileEntityMiner miner; + private final TileEntityMiner miner; public GuiMiner(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerMiner(inventory, tile)); @@ -51,11 +51,6 @@ public class GuiMiner extends GuiContainer{ this.buttonList.add(buttonReset); } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.miner.getName()); 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 81b1f3842..58149624d 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 @@ -28,7 +28,7 @@ import java.util.Collections; public class GuiOilGenerator extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiOilGenerator"); - private TileEntityOilGenerator generator; + private final TileEntityOilGenerator generator; public GuiOilGenerator(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerOilGenerator(inventory, tile)); 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 952ae36a3..5b7341b87 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 @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiPhantomPlacer extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiBreaker"); - private TileEntityPhantomPlacer placer; + private final TileEntityPhantomPlacer placer; public GuiPhantomPlacer(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerPhantomPlacer(inventory, tile)); @@ -34,11 +34,6 @@ public class GuiPhantomPlacer extends GuiContainer{ this.ySize = 93+86; } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.placer.getName()); 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 17c93bf39..f2868e33a 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 @@ -34,14 +34,14 @@ import java.util.Collections; public class GuiRangedCollector extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiRangedCollector"); - private TileEntityRangedCollector collector; + private final TileEntityRangedCollector collector; private GuiInputter.SmallerButton whitelistButton; - private int x; - private int y; - private int z; - private World world; + private final int x; + private final int y; + private final int z; + private final World world; public GuiRangedCollector(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world){ super(new ContainerRangedCollector(inventory, tile)); 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 7fee48ddb..452d725a1 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 @@ -27,7 +27,7 @@ import java.util.Collections; public class GuiRepairer extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiRepairer"); - private TileEntityItemRepairer tileRepairer; + private final TileEntityItemRepairer tileRepairer; public GuiRepairer(InventoryPlayer inventory, TileEntityBase tile){ super(new ContainerRepairer(inventory, tile)); 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 3e11b4d09..d4259da40 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 @@ -36,14 +36,14 @@ public class GuiSmileyCloud extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiSmileyCloud"); - private int x; - private int y; - private int z; - private World world; + private final int x; + private final int y; + private final int z; + private final World world; private GuiTextField nameField; - private TileEntitySmileyCloud cloud; + private final TileEntitySmileyCloud cloud; public GuiSmileyCloud(TileEntityBase tile, int x, int y, int z, World world){ super(new ContainerSmileyCloud()); @@ -67,12 +67,6 @@ public class GuiSmileyCloud extends GuiContainer{ this.nameField.setFocused(true); } - @Override - @SuppressWarnings("unchecked") - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ String name = this.cloud.name == null || this.cloud.name.isEmpty() ? "" : TextFormatting.GOLD+this.cloud.name+TextFormatting.RESET+" "+StringUtil.localize("info."+ModUtil.MOD_ID+".gui.the")+" "; 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 e23914994..2b7738d3f 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 @@ -31,11 +31,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiXPSolidifier extends GuiContainer{ private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiXPSolidifier"); - private TileEntityXPSolidifier solidifier; - private int x; - private int y; - private int z; - private World world; + private final TileEntityXPSolidifier solidifier; + private final int x; + private final int y; + private final int z; + private final World world; public GuiXPSolidifier(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world){ super(new ContainerXPSolidifier(inventory, tile)); @@ -74,11 +74,6 @@ public class GuiXPSolidifier extends GuiContainer{ this.buttonList.add(buttonAll); } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } - @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.solidifier.getName()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java index 897cef9f7..fe79dbde8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java @@ -15,6 +15,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class SlotImmovable extends Slot{ public SlotImmovable(IInventory inventory, int id, int x, int y){ @@ -31,6 +33,7 @@ public class SlotImmovable extends Slot{ } + @Nonnull @Override public ItemStack decrStackSize(int i){ return null; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java index bb0fe2f7b..e3cd62e73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java @@ -40,9 +40,9 @@ public class InitForeignPaxels{ private static final String SIMPLE_ORES = "simpleores"; private static final String[] SO_NAMES = new String[]{"tin", "mythril", "copper", "onyx", "adamantium"}; private static final String[] SO_REPAIR_NAMES = new String[]{"ingotTin", "ingotMythril", "ingotCopper", "gemOnyx", "ingotAdamantium"}; - public static Item[] tfPaxels = new Item[9]; - public static Item[] soPaxels = new Item[5]; - private static Item[] mtPaxels = new Item[6]; + public static final Item[] tfPaxels = new Item[9]; + public static final Item[] soPaxels = new Item[5]; + private static final Item[] mtPaxels = new Item[6]; public static void init(){ //SimpleOres diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 48d33573b..f6c5cf9d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -34,6 +34,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.HashSet; import java.util.Set; @@ -58,13 +59,14 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(resLoc, "inventory")); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack){ + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack){ return this.hasExtraWhitelist(state.getBlock()) || state.getBlock().getMaterial(state).isToolNotRequired() || (state.getBlock() == Blocks.SNOW_LAYER || state.getBlock() == Blocks.SNOW || (state.getBlock() == Blocks.OBSIDIAN ? this.toolMaterial.getHarvestLevel() >= 3 : (state.getBlock() != Blocks.DIAMOND_BLOCK && state.getBlock() != Blocks.DIAMOND_ORE ? (state.getBlock() != Blocks.EMERALD_ORE && state.getBlock() != Blocks.EMERALD_BLOCK ? (state.getBlock() != Blocks.GOLD_BLOCK && state.getBlock() != Blocks.GOLD_ORE ? (state.getBlock() != Blocks.IRON_BLOCK && state.getBlock() != Blocks.IRON_ORE ? (state.getBlock() != Blocks.LAPIS_BLOCK && state.getBlock() != Blocks.LAPIS_ORE ? (state.getBlock() != Blocks.REDSTONE_ORE && state.getBlock() != Blocks.LIT_REDSTONE_ORE ? (state.getBlock().getMaterial(state) == Material.ROCK || (state.getBlock().getMaterial(state) == Material.IRON || state.getBlock().getMaterial(state) == Material.ANVIL)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2))); } @@ -81,6 +83,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ return false; } + @Nonnull @Override public Set getToolClasses(ItemStack stack){ HashSet hashSet = new HashSet(); @@ -91,7 +94,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state){ + public float getStrVsBlock(@Nonnull ItemStack stack, IBlockState state){ return this.hasExtraWhitelist(state.getBlock()) || state.getBlock().getHarvestTool(state) == null || state.getBlock().getHarvestTool(state).isEmpty() || this.getToolClasses(stack).contains(state.getBlock().getHarvestTool(state)) ? this.efficiencyOnProperMaterial : 1.0F; } @@ -100,7 +103,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ public IItemColor getColor(){ return new IItemColor(){ @Override - public int getColorFromItemstack(ItemStack stack, int pass){ + public int getColorFromItemstack(@Nonnull ItemStack stack, int pass){ return pass > 0 ? ItemAllToolAA.this.color : 0xFFFFFF; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java index 0c31cf28a..a97265193 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java @@ -20,6 +20,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.Set; public class ItemAxeAA extends ItemToolAA{ @@ -35,7 +36,7 @@ public class ItemAxeAA extends ItemToolAA{ } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state){ + public float getStrVsBlock(@Nonnull ItemStack stack, IBlockState state){ Material material = state.getMaterial(); return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 19fc959ee..88ae14cbc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -14,6 +14,8 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemBattery extends ItemEnergy{ public ItemBattery(String name, int capacity, int transfer){ @@ -21,6 +23,7 @@ public class ItemBattery extends ItemEnergy{ this.setMaxStackSize(1); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index e5a2479e5..f55f9aafc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -42,6 +42,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemBooklet extends ItemBase implements IHudDisplay{ @@ -55,6 +56,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ this.setMaxDamage(0); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitX, float hitY, float hitZ){ if(player.isSneaking()){ @@ -63,7 +65,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ BookletPage page = BookletUtils.getFirstPageForStack(blockStack); if(page != null){ if(world.isRemote){ - forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1); + forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().getEntry(), ActuallyAdditionsAPI.BOOKLET_ENTRIES.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1); } this.onItemRightClick(stack, world, player, hand); return EnumActionResult.SUCCESS; @@ -72,8 +74,9 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ return EnumActionResult.FAIL; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); if(!world.isRemote){ @@ -88,6 +91,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ list.add(StringUtil.localize("tooltip."+ModUtil.MOD_ID+"."+this.getBaseName()+".desc")); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index de44d2ff9..c638ce7d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -28,12 +28,15 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemChestToCrateUpgrade extends ItemBase{ public ItemChestToCrateUpgrade(String name){ super(name); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack heldStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float par8, float par9, float par10){ if(player.isSneaking()){ @@ -55,7 +58,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{ //Set New Block if(!ConfigValues.lessBlockBreakingEffects){ - world.playAuxSFX(2001, pos, Block.getStateId(world.getBlockState(pos))); + world.playBroadcastSound(2001, pos, Block.getStateId(world.getBlockState(pos))); } PosUtil.setBlock(pos, world, InitBlocks.blockGiantChest, 0, 2); @@ -83,6 +86,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{ return super.onItemUse(heldStack, player, world, pos, hand, facing, par8, par9, par10); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java index 018de5430..4d9534e5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -31,6 +31,7 @@ import net.minecraft.util.StringUtils; import net.minecraft.world.World; import net.minecraftforge.fml.common.Loader; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -64,7 +65,7 @@ public class ItemCoffee extends ItemFoodBase{ } public static CoffeeIngredient getIngredientFromStack(ItemStack stack){ - for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.coffeeMachineIngredients){ + for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS){ if(ingredient.ingredient.copy().isItemEqual(stack)){ return ingredient; } @@ -82,7 +83,7 @@ public class ItemCoffee extends ItemFoodBase{ } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player){ + public ItemStack onItemUseFinish(ItemStack stack, @Nonnull World world, EntityLivingBase player){ ItemStack theStack = stack.copy(); super.onItemUseFinish(stack, world, player); applyPotionEffectsFromStack(stack, player); @@ -95,6 +96,7 @@ public class ItemCoffee extends ItemFoodBase{ } } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack stack){ return EnumAction.DRINK; @@ -124,6 +126,7 @@ public class ItemCoffee extends ItemFoodBase{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java index 51622519d..12a2e8f30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java @@ -14,6 +14,8 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemCoffeeBean extends ItemFoodBase{ public ItemCoffeeBean(String name){ @@ -21,6 +23,7 @@ public class ItemCoffeeBean extends ItemFoodBase{ this.setMaxDamage(0); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index 7ad64abbb..96bf818ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -21,6 +21,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemCrafterOnAStick extends ItemBase{ public ItemCrafterOnAStick(String name){ @@ -28,14 +30,16 @@ public class ItemCrafterOnAStick extends ItemBase{ this.setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CRAFTER.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } return new ActionResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index d931e2ca3..5532a481b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -19,10 +19,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemCrystal extends ItemBase{ @@ -38,11 +38,13 @@ public class ItemCrystal extends ItemBase{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= BlockCrystal.allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+BlockCrystal.allCrystals[stack.getItemDamage()].name; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= BlockCrystal.allCrystals.length ? EnumRarity.COMMON : BlockCrystal.allCrystals[stack.getItemDamage()].rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index bbe86937d..ec9438f71 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -50,6 +50,7 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -75,6 +76,7 @@ public class ItemDrill extends ItemEnergy{ this.setHarvestLevel("pickaxe", HARVEST_LEVEL); } + @Nonnull @Override //Places Blocks if the Placing Upgrade is installed public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ @@ -157,8 +159,9 @@ public class ItemDrill extends ItemEnergy{ return slots; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote && player.isSneaking()){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } @@ -201,13 +204,15 @@ public class ItemDrill extends ItemEnergy{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; } + @Nonnull @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack){ + public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack){ Multimap map = super.getAttributeModifiers(slot, stack); if(slot == EntityEquipmentSlot.MAINHAND){ @@ -259,12 +264,13 @@ public class ItemDrill extends ItemEnergy{ } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack){ + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack){ int harvestLevel = this.getHarvestLevel(stack, ""); Block block = state.getBlock(); return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || block.getMaterial(state).isToolNotRequired() || (block == Blocks.SNOW_LAYER || block == Blocks.SNOW || (block == Blocks.OBSIDIAN ? harvestLevel >= 3 : (block != Blocks.DIAMOND_BLOCK && block != Blocks.DIAMOND_ORE ? (block != Blocks.EMERALD_ORE && block != Blocks.EMERALD_BLOCK ? (block != Blocks.GOLD_BLOCK && block != Blocks.GOLD_ORE ? (block != Blocks.IRON_BLOCK && block != Blocks.IRON_ORE ? (block != Blocks.LAPIS_BLOCK && block != Blocks.LAPIS_ORE ? (block != Blocks.REDSTONE_ORE && block != Blocks.LIT_REDSTONE_ORE ? (block.getMaterial(state) == Material.ROCK || (block.getMaterial(state) == Material.IRON || block.getMaterial(state) == Material.ANVIL)) : harvestLevel >= 2) : harvestLevel >= 1) : harvestLevel >= 1) : harvestLevel >= 2) : harvestLevel >= 2) : harvestLevel >= 2)))); } + @Nonnull @Override public Set getToolClasses(ItemStack stack){ HashSet hashSet = new HashSet(); @@ -274,7 +280,7 @@ public class ItemDrill extends ItemEnergy{ } @Override - public int getHarvestLevel(ItemStack stack, String toolClass){ + public int getHarvestLevel(ItemStack stack, @Nonnull String toolClass){ return HARVEST_LEVEL; } @@ -344,7 +350,7 @@ public class ItemDrill extends ItemEnergy{ @Override @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list){ + public void getSubItems(@Nonnull Item item, CreativeTabs tabs, List list){ for(int i = 0; i < 16; i++){ this.addDrillStack(list, i); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java index c076bfde1..4cfd8d04b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java @@ -19,9 +19,11 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemDrillUpgrade extends ItemBase{ - public UpgradeType type; + public final UpgradeType type; public ItemDrillUpgrade(UpgradeType type, String unlocName){ super(unlocName); @@ -37,8 +39,9 @@ public class ItemDrillUpgrade extends ItemBase{ return -1; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote && this.type == UpgradeType.PLACER){ this.setSlotToPlaceFrom(stack, player.inventory.currentItem); return new ActionResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 17fa26b8e..ca7b5c4aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemDust extends ItemBase implements IColorProvidingItem{ @@ -40,11 +41,13 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allDusts.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allDusts[stack.getItemDamage()].name; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allDusts.length ? EnumRarity.COMMON : allDusts[stack.getItemDamage()].rarity; @@ -70,7 +73,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{ public IItemColor getColor(){ return new IItemColor(){ @Override - public int getColorFromItemstack(ItemStack stack, int pass){ + public int getColorFromItemstack(@Nonnull ItemStack stack, int pass){ return stack.getItemDamage() >= allDusts.length ? 0xFFFFFF : allDusts[stack.getItemDamage()].color; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index 08563140e..b6fee157a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -23,6 +23,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemFertilizer extends ItemBase{ public ItemFertilizer(String name){ @@ -31,17 +33,19 @@ public class ItemFertilizer extends ItemBase{ BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, new DispenserHandlerFertilize()); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){ if(ItemDye.applyBonemeal(stack, world, pos, player)){ if(!world.isRemote){ - world.playAuxSFX(2005, pos, 0); + world.playBroadcastSound(2005, pos, 0); } return EnumActionResult.SUCCESS; } return super.onItemUse(stack, player, world, pos, hand, side, par8, par9, par10); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index f1fe99480..9cbee76c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -23,11 +23,11 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemFoods extends ItemFoodBase{ @@ -42,7 +42,7 @@ public class ItemFoods extends ItemFoodBase{ } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player){ + public ItemStack onItemUseFinish(ItemStack stack, @Nonnull World world, EntityLivingBase player){ ItemStack stackToReturn = super.onItemUseFinish(stack, world, player); ItemStack returnItem = stack.getItemDamage() >= allFoods.length ? null : allFoods[stack.getItemDamage()].returnItem; if(returnItem != null && player instanceof EntityPlayer){ @@ -62,6 +62,7 @@ public class ItemFoods extends ItemFoodBase{ return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].useDuration; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack stack){ return stack.getItemDamage() >= allFoods.length ? EnumAction.EAT : (allFoods[stack.getItemDamage()].getsDrunken ? EnumAction.DRINK : EnumAction.EAT); @@ -82,11 +83,13 @@ public class ItemFoods extends ItemFoodBase{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allFoods.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allFoods[stack.getItemDamage()].name; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allFoods.length ? EnumRarity.COMMON : allFoods[stack.getItemDamage()].rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java index 7c93d1bb2..a3f45c0b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java @@ -14,6 +14,8 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemGeneric extends ItemBase{ public ItemGeneric(String name){ @@ -21,6 +23,7 @@ public class ItemGeneric extends ItemBase{ this.setMaxDamage(0); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index 11427f011..f171bf602 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -25,6 +25,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -76,7 +77,7 @@ public class ItemGrowthRing extends ItemEnergy{ //Show Particles if Metadata changed if(PosUtil.getMetadata(pos, world) != metaBefore){ - world.playAuxSFX(2005, pos, 0); + world.playBroadcastSound(2005, pos, 0); } if(!player.capabilities.isCreativeMode){ @@ -92,6 +93,7 @@ public class ItemGrowthRing extends ItemEnergy{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index d45db89ee..2ddc3edd9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -21,14 +21,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemHairyBall extends ItemBase{ public ItemHairyBall(String name){ super(name); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ ItemStack returnItem = this.getRandomReturnItem(); if(!player.inventory.addItemStackToInventory(returnItem)){ @@ -44,9 +47,10 @@ public class ItemHairyBall extends ItemBase{ } public ItemStack getRandomReturnItem(){ - return WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.ballOfFurReturnItems).returnItem.copy(); + return WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.BALL_OF_FUR_RETURN_ITEMS).returnItem.copy(); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index 8fdefb846..6c9f2732b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -31,6 +31,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ @@ -49,11 +50,13 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allJams.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allJams[stack.getItemDamage()].name; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allJams.length ? EnumRarity.COMMON : allJams[stack.getItemDamage()].rarity; @@ -68,7 +71,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player){ + public ItemStack onItemUseFinish(ItemStack stack, @Nonnull World world, EntityLivingBase player){ ItemStack stackToReturn = super.onItemUseFinish(stack, world, player); if(player instanceof EntityPlayer && !world.isRemote && stack.getItemDamage() < allJams.length){ @@ -110,7 +113,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ public IItemColor getColor(){ return new IItemColor(){ @Override - public int getColorFromItemstack(ItemStack stack, int pass){ + public int getColorFromItemstack(@Nonnull ItemStack stack, int pass){ return pass > 0 ? (stack.getItemDamage() >= allJams.length ? 0xFFFFFF : allJams[stack.getItemDamage()].color) : 0xFFFFFF; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java index ca40804f1..d4567c059 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemKnife extends ItemBase{ public ItemKnife(String name){ @@ -33,14 +35,16 @@ public class ItemKnife extends ItemBase{ return true; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; } + @Nonnull @SuppressWarnings("unchecked") @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack){ + public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack){ Multimap map = super.getAttributeModifiers(slot, stack); if(slot == EntityEquipmentSlot.MAINHAND){ map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Knife Modifier", 3, 0)); @@ -48,8 +52,9 @@ public class ItemKnife extends ItemBase{ return map; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack stack){ + public ItemStack getContainerItem(@Nonnull ItemStack stack){ ItemStack theStack = stack.copy(); theStack.setItemDamage(theStack.getItemDamage()+1); theStack.stackSize = 1; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index 75a99c2e6..f69f7973c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -30,6 +30,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemLaserWrench extends ItemBase{ @@ -39,6 +40,7 @@ public class ItemLaserWrench extends ItemBase{ this.setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ if(!world.isRemote){ @@ -98,6 +100,7 @@ public class ItemLaserWrench extends ItemBase{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index c3f0ec950..d9c29a587 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; @@ -43,12 +44,14 @@ public class ItemLeafBlower extends ItemBase{ this.setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ player.setActiveHand(hand); return new ActionResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack stack){ return EnumAction.BOW; @@ -60,6 +63,7 @@ public class ItemLeafBlower extends ItemBase{ return Integer.MAX_VALUE; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return this.isAdvanced ? EnumRarity.EPIC : EnumRarity.RARE; @@ -117,7 +121,7 @@ public class ItemLeafBlower extends ItemBase{ //Plays the Breaking Sound if(!ConfigValues.lessBlockBreakingEffects){ - world.playAuxSFX(2001, theCoord, Block.getStateId(world.getBlockState(theCoord))); + world.playBroadcastSound(2001, theCoord, Block.getStateId(world.getBlockState(theCoord))); } //Deletes the Block diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index 9f1d30b7f..eac4fd8e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -20,6 +20,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.ArrayList; public class ItemMagnetRing extends ItemEnergy{ @@ -64,6 +65,7 @@ public class ItemMagnetRing extends ItemEnergy{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java deleted file mode 100644 index 0058045b9..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * This file ("ItemMinecartAA.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 - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.items; - -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import net.minecraft.block.BlockDispenser; -import net.minecraft.block.BlockRailBase; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBehaviorDispenseItem; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public abstract class ItemMinecartAA extends ItemBase{ - - private static final IBehaviorDispenseItem MINECART_DISPENSER_BEHAVIOR = new BehaviorDefaultDispenseItem(){ - private final BehaviorDefaultDispenseItem behaviourDefaultDispenseItem = new BehaviorDefaultDispenseItem(); - - @Override - public ItemStack dispenseStack(IBlockSource source, ItemStack stack){ - EnumFacing facing = BlockDispenser.getFacing(source.getBlockMetadata()); - World world = source.getWorld(); - double d0 = source.getX()+(double)facing.getFrontOffsetX()*1.125D; - double d1 = Math.floor(source.getY())+(double)facing.getFrontOffsetY(); - double d2 = source.getZ()+(double)facing.getFrontOffsetZ()*1.125D; - BlockPos pos = source.getBlockPos().offset(facing); - IBlockState state = world.getBlockState(pos); - BlockRailBase.EnumRailDirection direction = state.getBlock() instanceof BlockRailBase ? state.getValue(((BlockRailBase)state.getBlock()).getShapeProperty()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH; - double d3; - - if(BlockRailBase.isRailBlock(state)){ - if(direction.isAscending()){ - d3 = 0.6D; - } - else{ - d3 = 0.1D; - } - } - else{ - if(state.getMaterial() != Material.AIR || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))){ - return this.behaviourDefaultDispenseItem.dispense(source, stack); - } - - IBlockState state1 = world.getBlockState(pos.down()); - BlockRailBase.EnumRailDirection direction1 = state1.getBlock() instanceof BlockRailBase ? state1.getValue(((BlockRailBase)state1.getBlock()).getShapeProperty()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH; - - if(facing != EnumFacing.DOWN && direction1.isAscending()){ - d3 = -0.4D; - } - else{ - d3 = -0.9D; - } - } - - EntityMinecart cart = ((ItemMinecartAA)stack.getItem()).createCart(world, d0, d1+d3, d2); - - if(stack.hasDisplayName()){ - cart.setCustomNameTag(stack.getDisplayName()); - } - - world.spawnEntityInWorld(cart); - stack.splitStack(1); - return stack; - } - - @Override - protected void playDispenseSound(IBlockSource source){ - source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); - } - }; - - public ItemMinecartAA(String name){ - super(name); - this.maxStackSize = 1; - - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, MINECART_DISPENSER_BEHAVIOR); - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.UNCOMMON; - } - - public abstract EntityMinecart createCart(World world, double x, double y, double z); - - @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ - IBlockState state = worldIn.getBlockState(pos); - - if(!BlockRailBase.isRailBlock(state)){ - return EnumActionResult.FAIL; - } - else{ - if(!worldIn.isRemote){ - BlockRailBase.EnumRailDirection direction = state.getBlock() instanceof BlockRailBase ? state.getValue(((BlockRailBase)state.getBlock()).getShapeProperty()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH; - double d0 = 0.0D; - - if(direction.isAscending()){ - d0 = 0.5D; - } - - EntityMinecart cart = ((ItemMinecartAA)stack.getItem()).createCart(worldIn, (double)pos.getX()+0.5D, (double)pos.getY()+0.0625D+d0, (double)pos.getZ()+0.5D); - - if(stack.hasDisplayName()){ - cart.setCustomNameTag(stack.getDisplayName()); - } - - worldIn.spawnEntityInWorld(cart); - } - - stack.stackSize--; - return EnumActionResult.SUCCESS; - } - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 59df1de4d..a6fa6f604 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -19,10 +19,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemMisc extends ItemBase{ @@ -39,11 +39,13 @@ public class ItemMisc extends ItemBase{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allMiscItems.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allMiscItems[stack.getItemDamage()].name; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.COMMON : allMiscItems[stack.getItemDamage()].rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index cf75a861a..46082e8fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -32,6 +32,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemPhantomConnector extends ItemBase{ @@ -80,6 +81,7 @@ public class ItemPhantomConnector extends ItemBase{ stack.setTagCompound(tag); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ if(!world.isRemote){ @@ -146,6 +148,7 @@ public class ItemPhantomConnector extends ItemBase{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java index 79019a955..0e0d0d9b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java @@ -20,6 +20,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.Set; public class ItemPickaxeAA extends ItemToolAA{ @@ -76,7 +77,7 @@ public class ItemPickaxeAA extends ItemToolAA{ } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state){ + public float getStrVsBlock(@Nonnull ItemStack stack, IBlockState state){ Material material = state.getMaterial(); return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 82b32282b..231b968ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -29,13 +29,14 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ public static final ThePotionRings[] allRings = ThePotionRings.values(); - private boolean isAdvanced; + private final boolean isAdvanced; public ItemPotionRing(boolean isAdvanced, String name){ super(name); @@ -49,6 +50,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ return damage; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allRings.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allRings[stack.getItemDamage()].name; @@ -80,8 +82,9 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ } } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack){ + public String getItemStackDisplayName(@Nonnull ItemStack stack){ String standardName = StringUtil.localize(this.getUnlocalizedName()+".name"); if(stack.getItemDamage() < allRings.length){ String effect = StringUtil.localize(allRings[stack.getItemDamage()].name); @@ -90,6 +93,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ return standardName; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allRings.length ? EnumRarity.COMMON : allRings[stack.getItemDamage()].rarity; @@ -115,7 +119,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ public IItemColor getColor(){ return new IItemColor(){ @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex){ + public int getColorFromItemstack(@Nonnull ItemStack stack, int tintIndex){ return stack.getItemDamage() >= allRings.length ? 0xFFFFFF : allRings[stack.getItemDamage()].color; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java index c2e19bcda..8088ac7a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java @@ -16,9 +16,7 @@ import de.canitzp.rarmor.api.modules.IRarmorModule; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.api.lens.LensConversion; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; @@ -32,6 +30,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -49,6 +48,7 @@ public class ItemRarmorModuleReconstructor extends ItemBase implements IRarmorMo return this.getRegistryName().toString(); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index 90fb054d6..68a78938b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -19,14 +19,17 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemResonantRice extends ItemBase{ public ItemResonantRice(String name){ super(name); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ stack.stackSize--; world.createExplosion(null, player.posX, player.posY, player.posZ, 0.5F, true); @@ -34,6 +37,7 @@ public class ItemResonantRice extends ItemBase{ return new ActionResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java index 99babedc2..c47d7a5b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java @@ -26,6 +26,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Set; public class ItemShovelAA extends ItemToolAA{ @@ -46,6 +47,7 @@ public class ItemShovelAA extends ItemToolAA{ return block == Blocks.SNOW_LAYER || block == Blocks.SNOW; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index 5c1c7bf21..09e8ec70e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -20,6 +20,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemSolidifiedExperience extends ItemBase{ public static final int SOLID_XP_AMOUNT = 8; @@ -28,8 +30,9 @@ public class ItemSolidifiedExperience extends ItemBase{ super(name); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ if(!player.isSneaking()){ world.spawnEntityInWorld(new EntityXPOrb(world, player.posX+0.5, player.posY+0.5, player.posZ+0.5, SOLID_XP_AMOUNT)); @@ -47,6 +50,7 @@ public class ItemSolidifiedExperience extends ItemBase{ return new ActionResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java index 82547e527..b87452aec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java @@ -32,6 +32,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class ItemSpawnerChanger extends ItemBase{ @@ -41,6 +42,7 @@ public class ItemSpawnerChanger extends ItemBase{ this.setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack aStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ if(!world.isRemote){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index 570438f2d..cb5c304c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -27,14 +27,17 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemTeleStaff extends ItemEnergy{ public ItemTeleStaff(String name){ super(500000, 10000, name); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ if(this.getWaitTime(stack) <= 0){ RayTraceResult pos = WorldUtil.getNearestPositionWithAir(world, player, 100); @@ -47,7 +50,7 @@ public class ItemTeleStaff extends ItemEnergy{ int baseUse = 200; int use = baseUse+(int)(baseUse*pos.hitVec.distanceTo(new Vec3d(player.posX, player.posY+(player.getEyeHeight()-player.getDefaultEyeHeight()), player.posZ))); if(this.getEnergyStored(stack) >= use){ - ((EntityPlayerMP)player).playerNetServerHandler.setPlayerLocation(x, y, z, player.rotationYaw, player.rotationPitch); + ((EntityPlayerMP)player).connection.setPlayerLocation(x, y, z, player.rotationYaw, player.rotationPitch); player.dismountRidingEntity(); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F); if(!player.capabilities.isCreativeMode){ @@ -72,6 +75,7 @@ public class ItemTeleStaff extends ItemEnergy{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index c2165d225..d8595e27f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -23,6 +23,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemWaterRemovalRing extends ItemEnergy{ public ItemWaterRemovalRing(String name){ @@ -74,6 +76,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{ } } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index a9fac2555..179be6801 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.ArrayList; public class ItemWingsOfTheBats extends ItemBase{ @@ -29,7 +30,7 @@ public class ItemWingsOfTheBats extends ItemBase{ *

* (Partially excerpted from Botania's Wing System by Vazkii (as I had fiddled around with the system and couldn't make it work) with permission, thanks!) */ - public static ArrayList wingedPlayers = new ArrayList(); + public static final ArrayList wingedPlayers = new ArrayList(); public ItemWingsOfTheBats(String name){ super(name); @@ -87,6 +88,7 @@ public class ItemWingsOfTheBats extends ItemBase{ return null; } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index c1df378d9..a263a9d81 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -18,11 +18,13 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemArmorAA extends ItemArmor{ - private ItemStack repairItem; - private String name; - private EnumRarity rarity; + private final ItemStack repairItem; + private final String name; + private final EnumRarity rarity; public ItemArmorAA(String name, ArmorMaterial material, int type, ItemStack repairItem){ this(name, material, type, repairItem, EnumRarity.RARE); @@ -55,6 +57,7 @@ public class ItemArmorAA extends ItemArmor{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java index 3b7d018dd..daffed792 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; public class ItemBase extends Item{ - private String name; + private final String name; public ItemBase(String name){ this.name = name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 0b3141e2b..52c421c00 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -23,11 +23,12 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public abstract class ItemEnergy extends ItemEnergyContainer{ - private String name; + private final String name; public ItemEnergy(int maxPower, int transfer, String name){ super(maxPower, transfer); @@ -81,7 +82,7 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ @Override @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list){ + public void getSubItems(@Nonnull Item item, CreativeTabs tabs, List list){ ItemStack stackFull = new ItemStack(this); this.setEnergy(stackFull, this.getMaxEnergyStored(stackFull)); list.add(stackFull); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java index 5d9e6e36d..e7cf046be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; public class ItemFoodBase extends ItemFood{ - private String name; + private final String name; public ItemFoodBase(int heal, float saturation, boolean wolfFood, String name){ super(heal, saturation, wolfFood); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index a9e93815f..7ef31d5a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java @@ -18,11 +18,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemHoeAA extends ItemHoe{ - private String name; - private EnumRarity rarity; - private ItemStack repairItem; + private final String name; + private final EnumRarity rarity; + private final ItemStack repairItem; public ItemHoeAA(Item.ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); @@ -52,6 +54,7 @@ public class ItemHoeAA extends ItemHoe{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java index 8a88a1e89..b1e72b4e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java @@ -24,11 +24,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import javax.annotation.Nonnull; + public class ItemSeed extends ItemSeeds{ - public Block plant; - public String name; - public String oredictName; + public final Block plant; + public final String name; + public final String oredictName; public ItemSeed(String name, String oredictName, Block plant, Item returnItem, int returnMeta){ super(plant, Blocks.FARMLAND); @@ -63,11 +65,13 @@ public class ItemSeed extends ItemSeeds{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; } + @Nonnull @Override public IBlockState getPlant(IBlockAccess world, BlockPos pos){ return this.plant.getDefaultState(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index f492a2514..8f6232fd4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java @@ -18,11 +18,13 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import javax.annotation.Nonnull; + public class ItemSwordAA extends ItemSword{ - private String name; - private EnumRarity rarity; - private ItemStack repairItem; + private final String name; + private final EnumRarity rarity; + private final ItemStack repairItem; public ItemSwordAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); @@ -57,10 +59,11 @@ public class ItemSwordAA extends ItemSword{ } @Override - public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ + public boolean getIsRepairable(ItemStack itemToRepair, @Nonnull ItemStack stack){ return ItemUtil.areItemsEqual(this.repairItem, stack, false); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java index a9beaa7cf..efbc0d478 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java @@ -19,13 +19,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; import java.util.Set; public class ItemToolAA extends ItemTool{ - private String name; - private EnumRarity rarity; - private ItemStack repairItem; + private final String name; + private final EnumRarity rarity; + private final ItemStack repairItem; private String repairOredict; public ItemToolAA(float attack, float speed, ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity, Set effectiveStuff){ @@ -61,13 +62,14 @@ public class ItemToolAA extends ItemTool{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; } @Override - public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ + public boolean getIsRepairable(ItemStack itemToRepair, @Nonnull ItemStack stack){ if(this.repairItem != null){ return ItemUtil.areItemsEqual(this.repairItem, stack, false); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index f2fd6ed79..2ee39211e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -16,9 +16,11 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemLens extends ItemBase implements ILensItem{ - private Lens type; + private final Lens type; public ItemLens(String name, Lens type){ super(name); @@ -27,6 +29,7 @@ public class ItemLens extends ItemBase implements ILensItem{ this.setMaxStackSize(1); } + @Nonnull @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java index 08d5a4f3a..5ca8d8b46 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java @@ -85,7 +85,7 @@ public class LensColor extends Lens{ if(stack != null){ Item item = stack.getItem(); if(item != null){ - for(Map.Entry changer : ActuallyAdditionsAPI.reconstructorLensColorChangers.entrySet()){ + for(Map.Entry changer : ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_COLOR_CHANGERS.entrySet()){ if(item == changer.getKey()){ return changer.getValue().modifyItem(stack, hitState, hitBlock, tile); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java index 4e55a5fa7..935d8929c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java @@ -30,7 +30,7 @@ import java.util.ArrayList; public class LensRecipeHandler{ - public static ArrayList mainPageRecipes = new ArrayList(); + public static final ArrayList mainPageRecipes = new ArrayList(); public static LensConversionRecipe recipeColorLens; public static LensConversionRecipe recipeSoulSand; public static LensConversionRecipe recipeGreenWall; @@ -114,7 +114,7 @@ public class LensRecipeHandler{ public static ArrayList getRecipesFor(ItemStack input){ ArrayList possibleRecipes = new ArrayList(); - for(LensConversionRecipe recipe : ActuallyAdditionsAPI.reconstructorLensConversionRecipes){ + for(LensConversionRecipe recipe : ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES){ if(ItemUtil.contains(recipe.getInputs(), input, true)){ possibleRecipes.add(recipe); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java index 5a2815ee3..e7acc24df 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java @@ -57,10 +57,10 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin{ new ReconstructorRecipeHandler() ); - registry.addRecipes(ActuallyAdditionsAPI.bookletPagesWithItemStackData); - registry.addRecipes(ActuallyAdditionsAPI.coffeeMachineIngredients); - registry.addRecipes(ActuallyAdditionsAPI.crusherRecipes); - registry.addRecipes(ActuallyAdditionsAPI.reconstructorLensConversionRecipes); + registry.addRecipes(ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_DATA); + registry.addRecipes(ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS); + registry.addRecipes(ActuallyAdditionsAPI.CRUSHER_RECIPES); + registry.addRecipes(ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES); registry.addRecipeClickArea(GuiCoffeeMachine.class, 53, 42, 22, 16, NEICoffeeMachineRecipe.NAME); registry.addRecipeClickArea(GuiGrinder.class, 80, 40, 24, 22, CrusherRecipeCategory.NAME); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java index afddebba9..3b52ca52b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java @@ -19,14 +19,16 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; +import javax.annotation.Nonnull; + public abstract class RecipeWrapperWithButton{ - protected TexturedButton theButton; + protected final TexturedButton theButton; public RecipeWrapperWithButton(){ this.theButton = new TexturedButton(23782, this.getButtonX(), this.getButtonY(), 146, 154, 20, 20){ @Override - public void drawButton(Minecraft minecraft, int x, int y){ + public void drawButton(@Nonnull Minecraft minecraft, int x, int y){ super.drawButton(minecraft, x, y); if(this.visible && this.hovered){ String text = StringUtil.localize("booklet."+ModUtil.MOD_ID+".clickToSeeRecipe"); @@ -48,7 +50,7 @@ public abstract class RecipeWrapperWithButton{ if(page != null){ GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen, false, true); Minecraft.getMinecraft().displayGuiScreen(book); - BookletUtils.openIndexEntry(book, page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); + BookletUtils.openIndexEntry(book, page.getChapter().getEntry(), ActuallyAdditionsAPI.BOOKLET_ENTRIES.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openChapter(book, page.getChapter(), page); return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java index ab7ee1467..467e9c4bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java @@ -24,7 +24,7 @@ import java.util.Arrays; public class BookletRecipeCategory implements IRecipeCategory{ - private IDrawable background; + private final IDrawable background; public BookletRecipeCategory(IGuiHelper helper){ this.background = helper.createBlankDrawable(160, 100); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index e0065e683..41ec53f08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java @@ -29,7 +29,7 @@ import java.util.List; public class BookletRecipeWrapper extends RecipeWrapperWithButton implements IRecipeWrapper{ - public BookletPage thePage; + public final BookletPage thePage; public BookletRecipeWrapper(BookletPage page){ this.thePage = page; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java index c99f9eeed..bdfae76f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; public class CoffeeMachineRecipeCategory implements IRecipeCategory{ - private IDrawable background; + private final IDrawable background; public CoffeeMachineRecipeCategory(IGuiHelper helper){ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEICoffeeMachine"), 0, 0, 126, 88); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java index aeec37750..3a08622ec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java @@ -33,10 +33,10 @@ import java.util.List; public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton implements IRecipeWrapper{ - public CoffeeIngredient theIngredient; - public ItemStack theOutput; - public ItemStack cup = new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); - public ItemStack coffeeBeans = new ItemStack(InitItems.itemCoffeeBean); + public final CoffeeIngredient theIngredient; + public final ItemStack theOutput; + public final ItemStack cup = new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); + public final ItemStack coffeeBeans = new ItemStack(InitItems.itemCoffeeBean); public CoffeeMachineRecipeWrapper(CoffeeIngredient ingredient){ this.theIngredient = ingredient; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java index 8806aaf7d..6476d5a39 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java @@ -27,7 +27,7 @@ public class CrusherRecipeCategory implements IRecipeCategory{ public static final String NAME = "actuallyadditions.crushing"; - private IDrawable background; + private final IDrawable background; public CrusherRecipeCategory(IGuiHelper helper){ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiGrinder"), 60, 13, 56, 79); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java index 66032a2ba..16d92fe1e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java @@ -28,7 +28,7 @@ import java.util.List; public class CrusherRecipeWrapper extends RecipeWrapperWithButton implements IRecipeWrapper{ - public CrusherRecipe theRecipe; + public final CrusherRecipe theRecipe; public CrusherRecipeWrapper(CrusherRecipe recipe){ this.theRecipe = recipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java index 38ffdd941..88e48b9c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class ReconstructorRecipeCategory implements IRecipeCategory{ private static final ItemStack RECONSTRUCTOR = new ItemStack(InitBlocks.blockAtomicReconstructor); - private IDrawable background; + private final IDrawable background; public ReconstructorRecipeCategory(IGuiHelper helper){ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEIAtomicReconstructor"), 0, 0, 96, 60); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java index fd7d35066..7e396da08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java @@ -27,7 +27,7 @@ import java.util.List; public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton implements IRecipeWrapper{ - public LensConversionRecipe theRecipe; + public final LensConversionRecipe theRecipe; public ReconstructorRecipeWrapper(LensConversionRecipe recipe){ this.theRecipe = recipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java index fd9566658..cdcffacde 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java @@ -11,14 +11,11 @@ package de.ellpeck.actuallyadditions.mod.material; import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import net.minecraft.entity.item.EntityMinecart; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.util.SoundEvent; import net.minecraftforge.common.util.EnumHelper; -import java.util.Locale; - public class InitArmorMaterials{ public static ArmorMaterial armorMaterialEmerald; @@ -48,6 +45,8 @@ public class InitArmorMaterials{ } private static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability, SoundEvent soundOnEquip){ - return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip); + //TODO Fuck forge because this broke + //return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip); + return EnumHelper.addEnum(ArmorMaterial.class, name, new Class[]{String.class, int.class, int[].class, int.class, SoundEvent.class, float.class}, textureName, durability, reductionAmounts, enchantability, soundOnEquip, 0F); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java index 1c4f9feb7..74c267311 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java @@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.material; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemArmor; -import net.minecraft.util.SoundEvent; import net.minecraftforge.common.util.EnumHelper; import java.util.Locale; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java index a6cd7602f..d7acbfb76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java @@ -43,13 +43,11 @@ public class BannerHelper{ * @param craftingStack An ItemStack which is used in the crafting recipe for this pattern. * An example of this would be the creeper skull being used for the creeper * pattern. - * @return EnumBannerPattern: A reference to the new EnumBannerPattern entry that has been - * created. */ - public static EnumBannerPattern addCraftingPattern(String name, ItemStack craftingStack){ - Class[] paramTypes = {String.class, String.class, ItemStack.class}; + public static void addCraftingPattern(String name, ItemStack craftingStack){ + Class[] paramTypes = {String.class, String.class, ItemStack.class}; Object[] paramValues = {ModUtil.MOD_ID+name, ModUtil.MOD_ID+name, craftingStack}; - return EnumHelper.addEnum(EnumBannerPattern.class, (ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), paramTypes, paramValues); + EnumHelper.addEnum(EnumBannerPattern.class, (ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), paramTypes, paramValues); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java index 796456ae9..a3bfe983c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java @@ -18,17 +18,20 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import javax.annotation.Nonnull; + public class DamageSources extends DamageSource{ public static final DamageSource DAMAGE_ATOMIC_RECONSTRUCTOR = new DamageSources("atomicReconstructor", 5).setDamageBypassesArmor(); - private int messageCount; + private final int messageCount; public DamageSources(String name, int messageCount){ super(name); this.messageCount = messageCount; } + @Nonnull @Override public ITextComponent getDeathMessage(EntityLivingBase entity){ String locTag = "death."+ModUtil.MOD_ID+"."+this.damageType+"."+(Util.RANDOM.nextInt(this.messageCount)+1); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java index 9322f22d2..a8ad69a67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java @@ -19,8 +19,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nonnull; + public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem{ + @Nonnull @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack){ EnumFacing facing = BlockDispenser.getFacing(source.getBlockMetadata()); @@ -29,8 +32,8 @@ public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem{ int z = source.getBlockTileEntity().getPos().getZ()+facing.getFrontOffsetZ(); BlockPos pos = new BlockPos(x, y, z); - if(ItemDye.applyBonemeal(stack, source.getWorld(), pos, null)){ - source.getWorld().playAuxSFX(2005, pos, 0); + if(ItemDye.applyBonemeal(stack, source.getWorld(), pos)){ + source.getWorld().playBroadcastSound(2005, pos, 0); } return stack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java index 38d25fc5c..c8100301b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java @@ -24,7 +24,7 @@ public class LaserRelayConnectionHandler{ /** * All of the Networks */ - public ConcurrentSet networks = new ConcurrentSet(); + public final ConcurrentSet networks = new ConcurrentSet(); public static LaserRelayConnectionHandler getInstance(){ if(instance == null){ @@ -157,8 +157,8 @@ public class LaserRelayConnectionHandler{ public static class ConnectionPair{ - public BlockPos firstRelay; - public BlockPos secondRelay; + public final BlockPos firstRelay; + public final BlockPos secondRelay; public ConnectionPair(BlockPos firstRelay, BlockPos secondRelay){ this.firstRelay = firstRelay; @@ -202,7 +202,7 @@ public class LaserRelayConnectionHandler{ public static class Network{ - public ConcurrentSet connections = new ConcurrentSet(); + public final ConcurrentSet connections = new ConcurrentSet(); @Override public String toString(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java index 54bd7b0e0..62e6e313c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java @@ -10,16 +10,10 @@ package de.ellpeck.actuallyadditions.mod.misc; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; -import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; -import de.ellpeck.actuallyadditions.api.internal.IEntrySet; import de.ellpeck.actuallyadditions.api.internal.IMethodHandler; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.booklet.entry.EntrySet; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; import de.ellpeck.actuallyadditions.mod.util.PosUtil; @@ -142,7 +136,7 @@ public class MethodHandler implements IMethodHandler{ ItemStack output = outputs.get(0); if(output.getItem() instanceof ItemBlock){ if(!ConfigValues.lessBlockBreakingEffects){ - tile.getWorldObject().playAuxSFX(2001, pos, Block.getStateId(tile.getWorldObject().getBlockState(pos))); + tile.getWorldObject().playBroadcastSound(2001, pos, Block.getStateId(tile.getWorldObject().getBlockState(pos))); } PosUtil.setBlock(pos, tile.getWorldObject(), Block.getBlockFromItem(output.getItem()), output.getItemDamage(), 2); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/ParticleColored.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/ParticleColored.java index b6af18e4d..979111fc7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/ParticleColored.java @@ -10,15 +10,15 @@ package de.ellpeck.actuallyadditions.mod.misc; -import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.particle.ParticleRedstone; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class EntityColoredParticleFX extends EntityReddustFX{ +public class ParticleColored extends ParticleRedstone{ - public EntityColoredParticleFX(World world, double x, double y, double z, float size, float r, float g, float b, float ageMulti){ + public ParticleColored(World world, double x, double y, double z, float size, float r, float g, float b, float ageMulti){ super(world, x, y, z, size, r, g, b); //To work around Reddust particles resetting the color to red if it's 0 (which is really stupid to be honest) this.particleRed = ((float)(Math.random()*0.20000000298023224D)+0.8F)*r*((float)Math.random()*0.4F+0.6F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java index 8ea3d4c88..9d7dc204a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java @@ -18,6 +18,8 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; +import javax.annotation.Nonnull; + public class WorldData extends WorldSavedData{ public static final String DATA_TAG = ModUtil.MOD_ID+"WorldData"; @@ -76,43 +78,46 @@ public class WorldData extends WorldSavedData{ } @Override - public void readFromNBT(NBTTagCompound compound){ - //Laser World Data - NBTTagList networkList = compound.getTagList("Networks", 10); - for(int i = 0; i < networkList.tagCount(); i++){ - LaserRelayConnectionHandler.Network network = LaserRelayConnectionHandler.getInstance().readNetworkFromNBT(networkList.getCompoundTagAt(i)); - LaserRelayConnectionHandler.getInstance().networks.add(network); - } + public void readFromNBT(@Nonnull NBTTagCompound compound){ + //Laser World Data + NBTTagList networkList = compound.getTagList("Networks", 10); + for(int i = 0; i < networkList.tagCount(); i++){ + LaserRelayConnectionHandler.Network network = LaserRelayConnectionHandler.getInstance().readNetworkFromNBT(networkList.getCompoundTagAt(i)); + LaserRelayConnectionHandler.getInstance().networks.add(network); + } - //Player Data - NBTTagList playerList = compound.getTagList("PlayerData", 10); - for(int i = 0; i < playerList.tagCount(); i++){ - PersistentServerData.PlayerSave aSave = PersistentServerData.PlayerSave.fromNBT(playerList.getCompoundTagAt(i)); - PersistentServerData.playerSaveData.add(aSave); - } + //Player Data + NBTTagList playerList = compound.getTagList("PlayerData", 10); + for(int i = 0; i < playerList.tagCount(); i++){ + PersistentServerData.PlayerSave aSave = PersistentServerData.PlayerSave.fromNBT(playerList.getCompoundTagAt(i)); + PersistentServerData.playerSaveData.add(aSave); + } - //Additional Data - additionalData = compound.getCompoundTag("Additional"); + //Additional Data + additionalData = compound.getCompoundTag("Additional"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound compound){ - //Laser World Data - NBTTagList networkList = new NBTTagList(); - for(LaserRelayConnectionHandler.Network network : LaserRelayConnectionHandler.getInstance().networks){ - networkList.appendTag(LaserRelayConnectionHandler.getInstance().writeNetworkToNBT(network)); - } - compound.setTag("Networks", networkList); + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound compound){ + //Laser World Data + NBTTagList networkList = new NBTTagList(); + for(LaserRelayConnectionHandler.Network network : LaserRelayConnectionHandler.getInstance().networks){ + networkList.appendTag(LaserRelayConnectionHandler.getInstance().writeNetworkToNBT(network)); + } + compound.setTag("Networks", networkList); - //Player Data - NBTTagList playerList = new NBTTagList(); - for(int i = 0; i < PersistentServerData.playerSaveData.size(); i++){ - PersistentServerData.PlayerSave theSave = PersistentServerData.playerSaveData.get(i); - playerList.appendTag(theSave.toNBT()); - } - compound.setTag("PlayerData", playerList); + //Player Data + NBTTagList playerList = new NBTTagList(); + for(int i = 0; i < PersistentServerData.playerSaveData.size(); i++){ + PersistentServerData.PlayerSave theSave = PersistentServerData.playerSaveData.get(i); + playerList.appendTag(theSave.toNBT()); + } + compound.setTag("PlayerData", playerList); - //Additional Data - compound.setTag("Additional", additionalData); + //Additional Data + compound.setTag("Additional", additionalData); + + return compound; } } 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 d57a1de6d..4bb38ad46 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 @@ -26,7 +26,7 @@ import java.util.List; public class SmileyCloudEasterEggs{ - public static List cloudStuff = new ArrayList(); + public static final List cloudStuff = new ArrayList(); static{ //Glenthor diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java index 119b4eab3..e6613e456 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java @@ -26,7 +26,7 @@ import java.util.Properties; public class SpecialRenderInit{ - public static HashMap specialList = new HashMap(); + public static final HashMap specialList = new HashMap(); public static void init(){ new ThreadSpecialFetcher(); 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 e004fb9b3..dbdb8349d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java @@ -32,7 +32,7 @@ public class NEIBookletRecipe/* extends TemplateRecipeHandler implements INEIRec @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEIBookletRecipe.class){ - for(BookletPage page : ActuallyAdditionsAPI.bookletPagesWithItemStackData){ + for(BookletPage page : ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_DATA){ ItemStack[] stacks = page.getItemStacksForPage(); //So that you don't see things like Mashed Food more than once 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 2cf4e03b8..8c18cf273 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java @@ -33,7 +33,7 @@ public class NEICoffeeMachineRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEICoffeeMachineRecipe.class){ - List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + List ingredients = ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS; for(CoffeeIngredient ingredient : ingredients){ arecipes.add(new CachedCoffee(ingredient)); } @@ -45,7 +45,7 @@ public class NEICoffeeMachineRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(ItemStack result){ - List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + List ingredients = ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS; for(CoffeeIngredient ingredient : ingredients){ if(result.getItem() instanceof ItemCoffee){ arecipes.add(new CachedCoffee(ingredient)); @@ -56,7 +56,7 @@ public class NEICoffeeMachineRecipe/* extends TemplateRecipeHandler implements I @Override public void loadUsageRecipes(ItemStack ingredient){ - List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + List ingredients = ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS; for(CoffeeIngredient ingr : ingredients){ if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(InitItems.itemCoffeeBean), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(ingr.ingredient.copy(), ingredient)){ CachedCoffee theRecipe = new CachedCoffee(ingr); 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 6b0af03e0..a1c6cfb78 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java @@ -29,7 +29,7 @@ public class NEICrusherRecipe/* extends TemplateRecipeHandler implements INEIRec @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(this.getBaseName()) && (getClass() == NEICrusherRecipe.class || getClass() == Double.class)){ - for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.CRUSHER_RECIPES){ arecipes.add(new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this)); } } @@ -40,7 +40,7 @@ public class NEICrusherRecipe/* extends TemplateRecipeHandler implements INEIRec @Override public void loadCraftingRecipes(ItemStack result){ - for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.CRUSHER_RECIPES){ if(ItemUtil.contains(recipe.getRecipeOutputOnes(), result, true) || ItemUtil.contains(recipe.getRecipeOutputTwos(), result, true)){ arecipes.add(new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this)); } @@ -49,7 +49,7 @@ public class NEICrusherRecipe/* extends TemplateRecipeHandler implements INEIRec @Override public void loadUsageRecipes(ItemStack ingredient){ - for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.CRUSHER_RECIPES){ if(ItemUtil.contains(recipe.getRecipeInputs(), ingredient, true)){ CachedCrush theRecipe = new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.ingredient), ingredient); 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 348cdbc26..2ac2f4288 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java @@ -37,7 +37,7 @@ public class NEIHairyBallRecipe/* extends TemplateRecipeHandler implements INEIR @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEIHairyBallRecipe.class){ - List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + List recipes = ActuallyAdditionsAPI.BALL_OF_FUR_RETURN_ITEMS; for(BallOfFurReturn recipe : recipes){ arecipes.add(new CachedBallRecipe(new ItemStack(InitItems.itemHairyBall), recipe.returnItem, recipe.itemWeight)); } @@ -49,7 +49,7 @@ public class NEIHairyBallRecipe/* extends TemplateRecipeHandler implements INEIR @Override public void loadCraftingRecipes(ItemStack result){ - List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + List recipes = ActuallyAdditionsAPI.BALL_OF_FUR_RETURN_ITEMS; for(BallOfFurReturn recipe : recipes){ if(NEIServerUtils.areStacksSameType(recipe.returnItem, result)){ arecipes.add(new CachedBallRecipe(new ItemStack(InitItems.itemHairyBall), recipe.returnItem, recipe.itemWeight)); @@ -59,7 +59,7 @@ public class NEIHairyBallRecipe/* extends TemplateRecipeHandler implements INEIR @Override public void loadUsageRecipes(ItemStack ingredient){ - List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + List recipes = ActuallyAdditionsAPI.BALL_OF_FUR_RETURN_ITEMS; for(BallOfFurReturn recipe : recipes){ ItemStack stack = new ItemStack(InitItems.itemHairyBall); if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)){ 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 655e71a82..daf7fd1b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java @@ -37,7 +37,7 @@ public class NEIReconstructorRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEIReconstructorRecipe.class){ - List recipes = ActuallyAdditionsAPI.reconstructorLensConversionRecipes; + List recipes = ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES; //Default Recipes for(LensNoneRecipe recipe : recipes){ arecipes.add(new CachedReconstructorRecipe(recipe, false)); @@ -66,7 +66,7 @@ public class NEIReconstructorRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(ItemStack result){ - List recipes = ActuallyAdditionsAPI.reconstructorLensConversionRecipes; + List recipes = ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES; //Default Recipes for(LensNoneRecipe recipe : recipes){ if(ItemUtil.contains(recipe.getOutputs(), result, true)){ @@ -84,7 +84,7 @@ public class NEIReconstructorRecipe/* extends TemplateRecipeHandler implements I @Override public void loadUsageRecipes(ItemStack ingredient){ - List recipes = ActuallyAdditionsAPI.reconstructorLensConversionRecipes; + List recipes = ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES; //Default Recipes for(LensNoneRecipe recipe : recipes){ if(ItemUtil.contains(recipe.getInputs(), ingredient, true)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java index 888ce197e..486dfa71c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java @@ -59,7 +59,7 @@ public class NEIScreenEvents{ if(page != null){ GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen, false, true); Minecraft.getMinecraft().displayGuiScreen(book); - BookletUtils.openIndexEntry(book, page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); + BookletUtils.openIndexEntry(book, page.getChapter().getEntry(), ActuallyAdditionsAPI.BOOKLET_ENTRIES.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openChapter(book, page.getChapter(), page); } } 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 e8603cfaa..f803df38e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java @@ -37,7 +37,7 @@ public class NEITreasureChestRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEITreasureChestRecipe.class){ - List recipes = ActuallyAdditionsAPI.treasureChestLoot; + List recipes = ActuallyAdditionsAPI.TREASURE_CHEST_LOOT; for(TreasureChestLoot recipe : recipes){ arecipes.add(new CachedTreasure(new ItemStack(InitBlocks.blockTreasureChest), recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); } @@ -49,7 +49,7 @@ public class NEITreasureChestRecipe/* extends TemplateRecipeHandler implements I @Override public void loadCraftingRecipes(ItemStack result){ - List recipes = ActuallyAdditionsAPI.treasureChestLoot; + List recipes = ActuallyAdditionsAPI.TREASURE_CHEST_LOOT; for(TreasureChestLoot recipe : recipes){ if(NEIServerUtils.areStacksSameType(recipe.returnItem, result)){ arecipes.add(new CachedTreasure(new ItemStack(InitBlocks.blockTreasureChest), recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); @@ -59,7 +59,7 @@ public class NEITreasureChestRecipe/* extends TemplateRecipeHandler implements I @Override public void loadUsageRecipes(ItemStack ingredient){ - List recipes = ActuallyAdditionsAPI.treasureChestLoot; + List recipes = ActuallyAdditionsAPI.TREASURE_CHEST_LOOT; for(TreasureChestLoot recipe : recipes){ ItemStack stack = new ItemStack(InitBlocks.blockTreasureChest); if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java index 59331ec55..411cfafff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java @@ -10,7 +10,7 @@ package de.ellpeck.actuallyadditions.mod.network; -import de.ellpeck.actuallyadditions.mod.misc.EntityColoredParticleFX; +import de.ellpeck.actuallyadditions.mod.misc.ParticleColored; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.util.math.Vec3d; @@ -62,7 +62,7 @@ public class PacketParticle implements IMessage{ for(int times = 0; times < Math.max(particleAmount/2, 1); times++){ for(double i = 0; i <= 1; i += 1/(distance*particleAmount)){ - EntityColoredParticleFX fx = new EntityColoredParticleFX(world, (difX*i)+endX+0.5, (difY*i)+endY+0.5, (difZ*i)+endZ+0.5, particleSize, color[0], color[1], color[2], ageMultiplier); + ParticleColored fx = new ParticleColored(world, (difX*i)+endX+0.5, (difY*i)+endY+0.5, (difZ*i)+endZ+0.5, particleSize, color[0], color[1], color[2], ageMultiplier); Minecraft.getMinecraft().effectRenderer.addEffect(fx); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 1b7807a1e..c344aa0d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -31,14 +31,12 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -46,6 +44,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import javax.annotation.Nonnull; import java.io.File; import java.util.*; @@ -57,14 +56,14 @@ public class ClientProxy implements IProxy{ public static int bookletWordCount; public static int bookletCharCount; - private static List colorProdividingItemsForRegistering = new ArrayList(); - private static Map modelLocationsForRegistering = new HashMap(); + private static final List colorProdividingItemsForRegistering = new ArrayList(); + private static final Map modelLocationsForRegistering = new HashMap(); private static void countBookletWords(){ bookletWordCount = 0; bookletCharCount = 0; - for(IBookletEntry entry : ActuallyAdditionsAPI.bookletEntries){ + for(IBookletEntry entry : ActuallyAdditionsAPI.BOOKLET_ENTRIES){ for(IBookletChapter chapter : entry.getChapters()){ for(BookletPage page : chapter.getPages()){ if(page.getText() != null){ @@ -107,7 +106,7 @@ public class ClientProxy implements IProxy{ if(manager instanceof IReloadableResourceManager){ ((IReloadableResourceManager)manager).registerReloadListener(new IResourceManagerReloadListener(){ @Override - public void onResourceManagerReload(IResourceManager resourceManager){ + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager){ countBookletWords(); } }); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java index cd5a4f494..a9d687aca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java @@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.proxy; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java index 7ee18a66e..1bb5dd3ca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java @@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java index cc946e6d1..28c768aa2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java @@ -24,11 +24,11 @@ import java.util.List; public class CrusherRecipeRegistry{ - public static ArrayList searchCases = new ArrayList(); + public static final ArrayList searchCases = new ArrayList(); public static void registerFinally(){ ArrayList oresNoResult = new ArrayList(); - int recipeStartedAt = ActuallyAdditionsAPI.crusherRecipes.size(); + int recipeStartedAt = ActuallyAdditionsAPI.CRUSHER_RECIPES.size(); for(String ore : OreDictionary.getOreNames()){ if(!hasException(ore)){ @@ -54,8 +54,8 @@ public class CrusherRecipeRegistry{ } ArrayList addedRecipes = new ArrayList(); - for(int i = recipeStartedAt; i < ActuallyAdditionsAPI.crusherRecipes.size(); i++){ - CrusherRecipe recipe = ActuallyAdditionsAPI.crusherRecipes.get(i); + for(int i = recipeStartedAt; i < ActuallyAdditionsAPI.CRUSHER_RECIPES.size(); i++){ + CrusherRecipe recipe = ActuallyAdditionsAPI.CRUSHER_RECIPES.get(i); addedRecipes.add(recipe.input+" -> "+recipe.outputOneAmount+"x "+recipe.outputOne); } ModUtil.LOGGER.info("Added "+addedRecipes.size()+" Crusher Recipes automatically: "+addedRecipes.toString()); @@ -72,7 +72,7 @@ public class CrusherRecipeRegistry{ } public static boolean hasOreRecipe(String input){ - for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.CRUSHER_RECIPES){ if(recipe.input != null && recipe.input.equals(input)){ return true; } @@ -86,7 +86,7 @@ public class CrusherRecipeRegistry{ } public static CrusherRecipe getRecipeFromInput(ItemStack input){ - for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.CRUSHER_RECIPES){ if(ItemUtil.contains(recipe.getRecipeInputs(), input, true)){ return recipe; } @@ -106,9 +106,9 @@ public class CrusherRecipeRegistry{ public static class SearchCase{ - String theCase; - int resultAmount; - String resultPreString; + final String theCase; + final int resultAmount; + final String resultPreString; public SearchCase(String theCase, int resultAmount){ this(theCase, resultAmount, "dust"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index 5f553df15..18382eb31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -16,9 +16,7 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.api.lens.LensConversion; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; -import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; import de.ellpeck.actuallyadditions.mod.misc.SoundHandler; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.PacketParticle; @@ -34,10 +32,12 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityAtomicReconstructor extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver, IRedstoneToggle, IEnergyDisplay, IAtomicReconstructor{ public static final int ENERGY_USE = 1000; - public EnergyStorage storage = new EnergyStorage(300000); + public final EnergyStorage storage = new EnergyStorage(300000); public int counter; private int currentTime; private boolean activateOnceWithSignal; @@ -158,7 +158,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return stack != null && stack.getItem() instanceof ILensItem; } @@ -189,12 +189,12 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index d6dc24fec..eaf8f3d22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -18,7 +18,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; @@ -27,10 +26,12 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; +import javax.annotation.Nonnull; + public abstract class TileEntityBase extends TileEntity implements ITickable{ public boolean isRedstonePowered; - public String name; + public final String name; protected int ticksElapsed; public TileEntityBase(String name){ @@ -95,15 +96,17 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ this.readSyncableNBT(compound, false); } + @Nonnull @Override - public final void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - compound.setBoolean("Redstone", this.isRedstonePowered); - this.writeSyncableNBT(compound, false); + public final NBTTagCompound writeToNBT(NBTTagCompound compound){ + NBTTagCompound newCompound = super.writeToNBT(compound); + newCompound.setBoolean("Redstone", this.isRedstonePowered); + this.writeSyncableNBT(newCompound, false); + return newCompound; } @Override - public final Packet getDescriptionPacket(){ + public final SPacketUpdateTileEntity getUpdatePacket(){ NBTTagCompound compound = this.getSyncCompound(); if(compound != null){ return new SPacketUpdateTileEntity(this.pos, 3, compound); @@ -121,7 +124,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ } @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState){ + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState){ return !(oldState.getBlock().isAssociatedBlock(newState.getBlock())); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java index e8bedd46e..8e61cb478 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java @@ -24,6 +24,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.ForgeEventFactory; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityBreaker extends TileEntityInventoryBase implements IRedstoneToggle{ @@ -73,7 +74,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return this.isPlacer; } @@ -90,7 +91,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst if(Util.RANDOM.nextFloat() <= chance){ if(WorldUtil.addToInventory(this, drops, false, true)){ if(!ConfigValues.lessBlockBreakingEffects){ - this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(stateToBreak)); + this.worldObj.playBroadcastSound(2001, coordsBlock, Block.getStateId(stateToBreak)); } WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos); WorldUtil.addToInventory(this, drops, true, true); @@ -108,12 +109,12 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 04c3ec2db..39985ff11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -24,13 +24,15 @@ import net.minecraftforge.fluids.*; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityCanolaPress extends TileEntityInventoryBase implements IEnergyReceiver, IFluidHandler, IEnergySaver, IFluidSaver{ public static final int PRODUCE = 80; public static final int ENERGY_USE = 35; private static final int TIME = 30; - public EnergyStorage storage = new EnergyStorage(40000); - public FluidTank tank = new FluidTank(2*Util.BUCKET); + public final EnergyStorage storage = new EnergyStorage(40000); + public final FluidTank tank = new FluidTank(2*Util.BUCKET); public int currentProcessTime; private int lastEnergyStored; private int lastTankAmount; @@ -116,7 +118,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return (i == 0 && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CANOLA.ordinal()); } @@ -125,12 +127,12 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index f3f180609..4eea61833 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -21,10 +21,12 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityCoalGenerator extends TileEntityInventoryBase implements IEnergyProvider, IEnergySaver{ public static final int PRODUCE = 30; - public EnergyStorage storage = new EnergyStorage(60000); + public final EnergyStorage storage = new EnergyStorage(60000); public int maxBurnTime; public int currentBurnTime; private int lastEnergy; @@ -110,17 +112,17 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return TileEntityFurnace.getItemBurnTime(stack) > 0; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index da11a8764..5f2b573d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -29,6 +29,8 @@ import net.minecraftforge.fluids.*; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements IButtonReactor, IEnergyReceiver, IFluidSaver, IFluidHandler, IEnergySaver{ public static final int SLOT_COFFEE_BEANS = 0; @@ -39,8 +41,8 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements public static final int WATER_USE = 500; public static final int COFFEE_CACHE_MAX_AMOUNT = 300; private static final int TIME_USED = 500; - public EnergyStorage storage = new EnergyStorage(300000); - public FluidTank tank = new FluidTank(4*Util.BUCKET); + public final EnergyStorage storage = new EnergyStorage(300000); + public final FluidTank tank = new FluidTank(4*Util.BUCKET); public int coffeeCacheAmount; public int brewTime; private int lastEnergy; @@ -110,7 +112,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return (i >= 3 && ItemCoffee.getIngredientFromStack(stack) != null) || (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal()); } @@ -170,12 +172,12 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == SLOT_OUTPUT || (slot >= 3 && slot < this.slots.length-2 && ItemCoffee.getIngredientFromStack(stack) == null); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java index daccdcb66..f4bba2821 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import javax.annotation.Nonnull; + public class TileEntityCompost extends TileEntityInventoryBase{ public static final int AMOUNT = 10; @@ -72,7 +74,7 @@ public class TileEntityCompost extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return stack.getItem() instanceof ItemMisc && stack.getItemDamage() == TheMiscItems.MASHED_FOOD.ordinal(); } @@ -83,12 +85,12 @@ public class TileEntityCompost extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return stack.getItem() instanceof ItemFertilizer; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index 85ed6fa8d..68c845e97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -26,13 +26,14 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver, IRedstoneToggle{ public static final int RANGE = 8; public static final int ENERGY_USE = 5; - public EnergyStorage storage = new EnergyStorage(10000); + public final EnergyStorage storage = new EnergyStorage(10000); private int lastEnergy; private int currentTime; private boolean activateOnceWithSignal; @@ -92,7 +93,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem if(Util.RANDOM.nextFloat() <= chance){ if(WorldUtil.addToInventory(this, drops, false, true)){ if(!ConfigValues.lessBlockBreakingEffects){ - this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(this.worldObj.getBlockState(coordsBlock))); + this.worldObj.playBroadcastSound(2001, coordsBlock, Block.getStateId(this.worldObj.getBlockState(coordsBlock))); } WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.getPos(), i); WorldUtil.addToInventory(this, drops, true, true); @@ -106,7 +107,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return false; } @@ -116,12 +117,12 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java index 7d7758543..7612f7722 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import javax.annotation.Nonnull; + public class TileEntityDropper extends TileEntityInventoryBase implements IRedstoneToggle{ private int currentTime; @@ -57,7 +59,7 @@ public class TileEntityDropper extends TileEntityInventoryBase implements IRedst } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return true; } @@ -86,12 +88,12 @@ public class TileEntityDropper extends TileEntityInventoryBase implements IRedst } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 7aad72f3a..835419b2e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -19,9 +19,11 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityEnergizer extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ - public EnergyStorage storage = new EnergyStorage(500000); + public final EnergyStorage storage = new EnergyStorage(500000); private int lastEnergy; public TileEntityEnergizer(){ @@ -66,17 +68,17 @@ public class TileEntityEnergizer extends TileEntityInventoryBase implements IEne } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return i == 0 && stack.getItem() instanceof IEnergyContainerItem; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == 1; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index ce5ca8e4e..605f8edb8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -20,9 +20,11 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityEnervator extends TileEntityInventoryBase implements IEnergyProvider, IEnergySaver{ - public EnergyStorage storage = new EnergyStorage(500000); + public final EnergyStorage storage = new EnergyStorage(500000); private int lastEnergy; public TileEntityEnervator(){ @@ -71,7 +73,7 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return i == 0 && stack.getItem() instanceof IEnergyContainerItem; } @@ -101,12 +103,12 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == 1; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java index 5b14bebf4..3babe3ee3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -20,6 +20,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityFeeder extends TileEntityInventoryBase{ @@ -110,7 +111,7 @@ public class TileEntityFeeder extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return true; } @@ -125,12 +126,12 @@ public class TileEntityFeeder extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return false; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 5eb3c205e..ee0908707 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -22,8 +22,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFermentingBarrel extends TileEntityBase implements IFluidHandler, IFluidSaver{ private static final int PROCESS_TIME = 100; - public FluidTank canolaTank = new FluidTank(2*Util.BUCKET); - public FluidTank oilTank = new FluidTank(2*Util.BUCKET); + public final FluidTank canolaTank = new FluidTank(2*Util.BUCKET); + public final FluidTank oilTank = new FluidTank(2*Util.BUCKET); public int currentProcessTime; private int lastCanola; private int lastOil; 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 e4d49acc5..51504807c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFireworkBox extends TileEntityBase implements IEnergyReceiver, IRedstoneToggle, IEnergyDisplay, IEnergySaver{ public static final int USE_PER_SHOT = 300; - public EnergyStorage storage = new EnergyStorage(20000); + public final EnergyStorage storage = new EnergyStorage(20000); private int timeUntilNextFirework; private boolean activateOnceWithSignal; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index 79d601778..2b14f652d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFluidCollector extends TileEntityBase implements IFluidHandler, IFluidSaver, IRedstoneToggle{ - public FluidTank tank = new FluidTank(8*Util.BUCKET); + public final FluidTank tank = new FluidTank(8*Util.BUCKET); public boolean isPlacer; private int lastTankAmount; private int currentTime; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index f1d8ac5ad..d16b15409 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -20,6 +20,8 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ public static final int SLOT_INPUT_1 = 0; @@ -28,7 +30,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements public static final int SLOT_OUTPUT_2 = 3; public static final int ENERGY_USE = 25; private static final int SMELT_TIME = 80; - public EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000); public int firstSmeltTime; public int secondSmeltTime; private int lastEnergy; @@ -115,7 +117,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && FurnaceRecipes.instance().getSmeltingResult(stack) != null; } @@ -164,12 +166,12 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == SLOT_OUTPUT_1 || slot == SLOT_OUTPUT_2; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java index 33c99ea2d..d594bcd7c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyProvider, IEnergySaver, IEnergyDisplay{ public static final int PRODUCE = 8; - public EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000); private int oldEnergy; public TileEntityFurnaceSolar(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java index dc259ff9f..df76e72a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java @@ -14,6 +14,8 @@ package de.ellpeck.actuallyadditions.mod.tile; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import javax.annotation.Nonnull; + public class TileEntityGiantChest extends TileEntityInventoryBase{ public TileEntityGiantChest(){ @@ -21,17 +23,17 @@ public class TileEntityGiantChest extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return true; } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java index 3f555a6f9..4a9b1ceb0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java @@ -54,7 +54,7 @@ public class TileEntityGreenhouseGlass extends TileEntityBase{ PosUtil.getBlock(blockToFert, this.worldObj).updateTick(this.worldObj, blockToFert, this.worldObj.getBlockState(blockToFert), Util.RANDOM); if(PosUtil.getMetadata(blockToFert, this.worldObj) != metaBefore){ - this.worldObj.playAuxSFX(2005, blockToFert, 0); + this.worldObj.playBroadcastSound(2005, blockToFert, 0); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index 2b540f197..1cc9564cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -25,6 +25,7 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityGrinder extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ @@ -36,7 +37,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg public static final int SLOT_OUTPUT_2_1 = 4; public static final int SLOT_OUTPUT_2_2 = 5; public static final int ENERGY_USE = 40; - public EnergyStorage storage = new EnergyStorage(60000); + public final EnergyStorage storage = new EnergyStorage(60000); public int firstCrushTime; public int secondCrushTime; public boolean isDouble; @@ -166,7 +167,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && CrusherRecipeRegistry.getRecipeFromInput(stack) != null; } @@ -255,12 +256,12 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == SLOT_OUTPUT_1_1 || slot == SLOT_OUTPUT_1_2 || slot == SLOT_OUTPUT_2_1 || slot == SLOT_OUTPUT_2_2; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java index 20e594eea..d707a0488 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java @@ -29,7 +29,7 @@ public class TileEntityHeatCollector extends TileEntityBase implements IEnergyPr public static final int ENERGY_PRODUCE = 40; public static final int BLOCKS_NEEDED = 4; - public EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000); private int oldEnergy; public TileEntityHeatCollector(){ 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 fcd91c5b8..ea4371936 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -22,6 +22,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import javax.annotation.Nonnull; + public class TileEntityInputter extends TileEntityInventoryBase implements IButtonReactor, INumberReactor{ public static final int PUT_FILTER_START = 13; @@ -425,17 +427,17 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return i == 0; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == 0; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index 880ea1a16..a0dd6b7e0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -23,10 +23,12 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.wrapper.SidedInvWrapper; +import javax.annotation.Nonnull; + public abstract class TileEntityInventoryBase extends TileEntityBase implements ISidedInventory{ public ItemStack slots[]; - private SidedInvWrapper[] invWrappers = new SidedInvWrapper[6]; + private final SidedInvWrapper[] invWrappers = new SidedInvWrapper[6]; public TileEntityInventoryBase(int slots, String name){ super(name); @@ -92,8 +94,9 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side){ + public int[] getSlotsForFace(@Nonnull EnumFacing side){ int invSize = this.getSizeInventory(); if(invSize > 0){ int[] theInt = new int[invSize]; @@ -113,22 +116,22 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } @Override - public boolean isUseableByPlayer(EntityPlayer player){ + public boolean isUseableByPlayer(@Nonnull EntityPlayer player){ return this.canPlayerUse(player); } @Override - public void openInventory(EntityPlayer player){ + public void openInventory(@Nonnull EntityPlayer player){ } @Override - public void closeInventory(EntityPlayer player){ + public void closeInventory(@Nonnull EntityPlayer player){ } @Override - public boolean isItemValidForSlot(int index, ItemStack stack){ + public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ return false; } @@ -200,6 +203,7 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return stack; } + @Nonnull @Override public String getName(){ return this.name; @@ -210,18 +214,20 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return false; } + @Nonnull @Override public ITextComponent getDisplayName(){ return new TextComponentString(StringUtil.localize(this.getName())); } @Override - public boolean hasCapability(Capability capability, EnumFacing facing){ + public boolean hasCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ return this.getCapability(capability, facing) != null; } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing){ + public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ if(this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){ return (T)this.invWrappers[facing.ordinal()]; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index f8192a96c..a55ce3bb2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -20,12 +20,14 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityItemRepairer extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver{ public static final int SLOT_INPUT = 0; public static final int SLOT_OUTPUT = 1; public static final int ENERGY_USE = 1500; - public EnergyStorage storage = new EnergyStorage(300000); + public final EnergyStorage storage = new EnergyStorage(300000); public int nextRepairTick; private int lastEnergy; @@ -102,7 +104,7 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return i == SLOT_INPUT; } @@ -120,12 +122,12 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot == SLOT_OUTPUT; } 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 937b8bc92..b4b17aae9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java @@ -84,12 +84,12 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction){ + public boolean canInsertItem(int index, @Nonnull ItemStack stack, @Nonnull EnumFacing direction){ return this.isItemValidForSlot(index, stack); } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction){ + public boolean canExtractItem(int index, @Nonnull ItemStack stack, @Nonnull EnumFacing direction){ SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(index); if(handler != null){ if(this.isWhitelisted(handler, stack)){ @@ -114,7 +114,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int index, ItemStack stack){ + public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(index); if(handler != null){ if(this.isWhitelisted(handler, stack)){ @@ -197,9 +197,9 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ private static class SpecificItemHandlerInfo{ - public IItemHandler handler; - public int switchedIndex; - public TileEntityLaserRelayItem relayInQuestion; + public final IItemHandler handler; + public final int switchedIndex; + public final TileEntityLaserRelayItem relayInQuestion; public SpecificItemHandlerInfo(IItemHandler handler, int switchedIndex, TileEntityLaserRelayItem relayInQuestion){ this.handler = handler; @@ -210,8 +210,8 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ public static class GenericItemHandlerInfo implements Comparable{ - public List handlers = new ArrayList(); - public TileEntityLaserRelayItem relayInQuestion; + public final List handlers = new ArrayList(); + public final TileEntityLaserRelayItem relayInQuestion; public GenericItemHandlerInfo(TileEntityLaserRelayItem relayInQuestion){ this.relayInQuestion = relayInQuestion; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index 152f56691..b5591f675 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -10,30 +10,16 @@ package de.ellpeck.actuallyadditions.mod.tile; -import cofh.api.energy.IEnergyReceiver; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.mod.network.PacketParticle; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.util.*; import io.netty.util.internal.ConcurrentSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandler; - -import java.util.ArrayList; -import java.util.List; public abstract class TileEntityLaserRelay extends TileEntityBase{ @@ -41,7 +27,7 @@ public abstract class TileEntityLaserRelay extends TileEntityBase{ private static final float[] COLOR = new float[]{1F, 0F, 0F}; private static final float[] COLOR_ITEM = new float[]{139F/255F, 94F/255F, 1F}; - public boolean isItem; + public final boolean isItem; public TileEntityLaserRelay(String name, boolean isItem){ super(name); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java index 040999203..595fa942e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java @@ -21,11 +21,12 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.items.IItemHandler; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem implements IButtonReactor{ - public IInventory filterInventory; + public final IInventory filterInventory; public boolean isLeftWhitelist; public boolean isRightWhitelist; private ItemStack[] slots = new ItemStack[24]; @@ -44,6 +45,7 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem return this; } + @Nonnull @Override public String getName(){ return this.tile.name; @@ -60,17 +62,17 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem } @Override - public boolean isUseableByPlayer(EntityPlayer player){ + public boolean isUseableByPlayer(@Nonnull EntityPlayer player){ return this.tile.canPlayerUse(player); } @Override - public void openInventory(EntityPlayer player){ + public void openInventory(@Nonnull EntityPlayer player){ } @Override - public void closeInventory(EntityPlayer player){ + public void closeInventory(@Nonnull EntityPlayer player){ } @@ -148,13 +150,14 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem return false; } + @Nonnull @Override public ITextComponent getDisplayName(){ return new TextComponentString(StringUtil.localize(this.getName())); } @Override - public boolean isItemValidForSlot(int index, ItemStack stack){ + public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ return false; } }.setTile(this); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java index 338299bbe..95ef03e82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java @@ -29,7 +29,7 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I public static final int HAS_LAVA = 1; public static final int HAS_AIR = 2; public static final int ENERGY_USE = 150000; - public EnergyStorage storage = new EnergyStorage(3000000); + public final EnergyStorage storage = new EnergyStorage(3000000); private int currentWorkTime; private int oldEnergy; 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 9c80b6e12..dca150d10 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -33,7 +33,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr public static final int RANGE = 7; public static final int ENERGY_PRODUCED = 300; - public EnergyStorage storage = new EnergyStorage(35000); + public final EnergyStorage storage = new EnergyStorage(35000); private int nextUseCounter; private int oldEnergy; @@ -83,7 +83,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr BlockPos theCoord = breakPositions.get(0); if(!ConfigValues.lessBlockBreakingEffects){ - this.worldObj.playAuxSFX(2001, theCoord, Block.getStateId(this.worldObj.getBlockState(theCoord))); + this.worldObj.playBroadcastSound(2001, theCoord, Block.getStateId(this.worldObj.getBlockState(theCoord))); } this.worldObj.setBlockToAir(theCoord); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index c175507c4..5ae1537b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -21,6 +21,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -33,13 +34,14 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; import java.util.List; public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyReceiver, IButtonReactor, IEnergySaver, IEnergyDisplay{ public static final int ENERGY_USE_PER_BLOCK = 500; public static final int DEFAULT_RANGE = 2; - public EnergyStorage storage = new EnergyStorage(1000000); + public final EnergyStorage storage = new EnergyStorage(1000000); public int layerAt = -1; public boolean onlyMineOres = true; private int oldLayerAt; @@ -96,17 +98,18 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR if(this.storage.getEnergyStored() >= actualUse){ BlockPos pos = new BlockPos(this.pos.getX()+anX, this.layerAt, this.pos.getZ()+aZ); - Block block = PosUtil.getBlock(pos, this.worldObj); + IBlockState state = this.worldObj.getBlockState(pos); + Block block = state.getBlock(); int meta = PosUtil.getMetadata(pos, this.worldObj); - if(block != null && !block.isAir(this.worldObj.getBlockState(pos), this.worldObj, pos)){ - if(block.getHarvestLevel(this.worldObj.getBlockState(pos)) <= 3F && block.getBlockHardness(this.worldObj.getBlockState(pos), this.worldObj, pos) >= 0F && !(block instanceof BlockLiquid) && !(block instanceof IFluidBlock) && this.isMinable(block, meta)){ + if(!block.isAir(this.worldObj.getBlockState(pos), this.worldObj, pos)){ + if(block.getHarvestLevel(this.worldObj.getBlockState(pos)) <= 3F && state.getBlockHardness(this.worldObj, pos) >= 0F && !(block instanceof BlockLiquid) && !(block instanceof IFluidBlock) && this.isMinable(block, meta)){ List drops = block.getDrops(this.worldObj, pos, this.worldObj.getBlockState(pos), 0); float chance = ForgeEventFactory.fireBlockHarvesting(drops, this.worldObj, pos, this.worldObj.getBlockState(pos), 0, 1, false, null); if(Util.RANDOM.nextFloat() <= chance){ if(WorldUtil.addToInventory(this, drops, false, true)){ if(!ConfigValues.lessBlockBreakingEffects){ - this.worldObj.playAuxSFX(2001, pos, Block.getStateId(this.worldObj.getBlockState(pos))); + this.worldObj.playBroadcastSound(2001, pos, Block.getStateId(this.worldObj.getBlockState(pos))); } this.worldObj.setBlockToAir(pos); @@ -145,7 +148,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR } String reg = block.getRegistryName().toString(); - if(reg != null && !reg.isEmpty()){ + if(!reg.isEmpty()){ for(String string : ConfigValues.minerExtraWhitelist){ if(reg.equals(string)){ return true; @@ -167,7 +170,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR private boolean isBlacklisted(Block block){ String reg = block.getRegistryName().toString(); - if(reg != null && !reg.isEmpty()){ + if(!reg.isEmpty()){ for(String string : ConfigValues.minerBlacklist){ if(reg.equals(string)){ return true; @@ -178,7 +181,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR } @Override - public boolean isItemValidForSlot(int slot, ItemStack stack){ + public boolean isItemValidForSlot(int slot, @Nonnull ItemStack stack){ return false; } @@ -203,12 +206,12 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index df2dbbbf2..dd286435b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -26,8 +26,8 @@ public class TileEntityOilGenerator extends TileEntityBase implements IEnergyPro public static final int ENERGY_PRODUCED = 76; private static final int BURN_TIME = 100; - public EnergyStorage storage = new EnergyStorage(50000); - public FluidTank tank = new FluidTank(2*Util.BUCKET); + public final EnergyStorage storage = new EnergyStorage(50000); + public final FluidTank tank = new FluidTank(2*Util.BUCKET); public int currentBurnTime; private int lastEnergy; private int lastTank; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java index 05ba3042a..39b1e38b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java @@ -18,6 +18,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public class TileEntityPhantomItemface extends TileEntityPhantomface{ public TileEntityPhantomItemface(){ @@ -25,8 +27,9 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ this.type = BlockPhantom.Type.FACE; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side){ + public int[] getSlotsForFace(@Nonnull EnumFacing side){ if(this.isBoundThingInRange()){ if(this.getSided() != null){ return this.getSided().getSlotsForFace(side); @@ -100,7 +103,7 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return this.isBoundThingInRange() && this.getInventory().isItemValidForSlot(i, stack); } @@ -110,17 +113,18 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canInsertItem(slot, stack, side)); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canExtractItem(slot, stack, side)); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing){ + public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).getCapability(capability, facing) : super.getCapability(capability, facing); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java index 8462f8c95..fde4b585c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -27,6 +27,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.ArrayList; public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements IPhantomTile, IRedstoneToggle{ @@ -130,7 +131,7 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements if(WorldUtil.addToInventory(this, drops, false, true)){ if(!ConfigValues.lessBlockBreakingEffects){ - this.worldObj.playAuxSFX(2001, this.boundPosition, Block.getStateId(this.worldObj.getBlockState(this.boundPosition))); + this.worldObj.playBroadcastSound(2001, this.boundPosition, Block.getStateId(this.worldObj.getBlockState(this.boundPosition))); } this.worldObj.setBlockToAir(this.boundPosition); WorldUtil.addToInventory(this, drops, true, true); @@ -192,17 +193,17 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return !this.isBreaker; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isBreaker; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java index 53004ae6e..1bc3f50cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java @@ -18,11 +18,11 @@ import java.util.Arrays; public class TileEntityPhantomRedstoneface extends TileEntityPhantomface{ - public int[] providesStrong = new int[EnumFacing.values().length]; - public int[] providesWeak = new int[EnumFacing.values().length]; + public final int[] providesStrong = new int[EnumFacing.values().length]; + public final int[] providesWeak = new int[EnumFacing.values().length]; - private int[] lastProvidesStrong = new int[this.providesStrong.length]; - private int[] lastProvidesWeak = new int[this.providesWeak.length]; + private final int[] lastProvidesStrong = new int[this.providesStrong.length]; + private final int[] lastProvidesWeak = new int[this.providesWeak.length]; public TileEntityPhantomRedstoneface(){ super("redstoneface"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index 3192446ba..abd92bfbd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -26,6 +26,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityPhantomface extends TileEntityInventoryBase implements IPhantomTile{ public static final int RANGE = 16; @@ -116,7 +118,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } @Override - public boolean isItemValidForSlot(int slot, ItemStack stack){ + public boolean isItemValidForSlot(int slot, @Nonnull ItemStack stack){ return false; } @@ -177,12 +179,12 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return false; } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java index 7fe3f936b..1b9e893fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; +import javax.annotation.Nonnull; import java.util.ArrayList; public class TileEntityRangedCollector extends TileEntityInventoryBase implements IButtonReactor{ @@ -86,17 +87,17 @@ public class TileEntityRangedCollector extends TileEntityInventoryBase implement } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return false; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return slot < WHITELIST_START; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java index 6b087fb41..7b04ab089 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java @@ -19,11 +19,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import javax.annotation.Nonnull; + public class TileEntityXPSolidifier extends TileEntityInventoryBase implements IButtonReactor{ public short amount; private short lastAmount; - private int[] buttonAmounts = new int[]{1, 5, 10, 20, 30, 40, 50, 64, -999}; + private final int[] buttonAmounts = new int[]{1, 5, 10, 20, 30, 40, 50, 64, -999}; public TileEntityXPSolidifier(){ super(1, "xpSolidifier"); @@ -66,17 +68,17 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ + public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ return false; } @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ + public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java index 5d465b788..b1f9fef3e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java @@ -20,6 +20,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + /** * (Excerpted from Tinkers' Construct with permission, thanks guys!) */ @@ -35,13 +37,15 @@ public class FluidStateMapper extends StateMapperBase implements ItemMeshDefinit this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID, "fluids"), fluid.getName()); } + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state){ + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state){ return this.location; } + @Nonnull @Override - public ModelResourceLocation getModelLocation(ItemStack stack){ + public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack){ return this.location; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java index 0dd5cf3ed..2a4274056 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java @@ -21,12 +21,12 @@ import java.util.List; public class RecipeUtil{ public static LensConversionRecipe lastReconstructorRecipe(){ - List list = ActuallyAdditionsAPI.reconstructorLensConversionRecipes; + List list = ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES; return list.get(list.size()-1); } public static CrusherRecipe lastCrusherRecipe(){ - List list = ActuallyAdditionsAPI.crusherRecipes; + List list = ActuallyAdditionsAPI.CRUSHER_RECIPES; return list.get(list.size()-1); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index 424b3ef4b..b70b6237f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -10,11 +10,7 @@ package de.ellpeck.actuallyadditions.mod.util; -import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.enchantment.Enchantment; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; 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 143126385..5ee8b4eca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -328,7 +328,7 @@ public class WorldUtil{ } else{ //Shows the Harvest Particles and plays the Block's Sound - world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.playBroadcastSound(2001, pos, Block.getStateId(state)); } //If the Block was actually "removed", meaning it will drop an Item @@ -355,12 +355,12 @@ public class WorldUtil{ if(!world.isRemote){ //Update the Client of a Block Change if(player instanceof EntityPlayerMP){ - ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new SPacketBlockChange(world, pos)); + ((EntityPlayerMP)player).connection.sendPacket(new SPacketBlockChange(world, pos)); } } else{ //Check the Server if a Block that changed on the Client really changed, if not, revert the change - Minecraft.getMinecraft().getNetHandler().addToSendQueue(new CPacketPlayerDigging(CPacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit)); + Minecraft.getMinecraft().getConnection().sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit)); } return removed; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java index d012513aa..06e65668e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java @@ -18,7 +18,7 @@ import java.util.UUID; public class PersistentServerData{ - public static ArrayList playerSaveData = new ArrayList(); + public static final ArrayList playerSaveData = new ArrayList(); public static NBTTagCompound getDataFromPlayer(EntityPlayer player){ //Get Data from existing data @@ -36,8 +36,8 @@ public class PersistentServerData{ public static class PlayerSave{ - public UUID thePlayerUUID; - public NBTTagCompound theCompound; + public final UUID thePlayerUUID; + public final NBTTagCompound theCompound; public PlayerSave(UUID theUUID, NBTTagCompound theCompound){ this.thePlayerUUID = theUUID;