From d9b6838df9363eaaf2e2ba2bcda574b70323e218 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Thu, 29 Jun 2017 12:30:02 -0400 Subject: [PATCH] Fix everything (#825) * Fix everything * json --- .gitignore | 9 +- build.gradle | 4 +- .../api/booklet/IBookletPage.java | 4 +- .../mod/ActuallyAdditions.java | 11 +- .../mod/ClientRegistryHandler.java | 5 + .../mod/RegistryHandler.java | 7 +- .../mod/blocks/BlockAtomicReconstructor.java | 2 +- .../mod/blocks/BlockCoalGenerator.java | 10 +- .../mod/blocks/BlockColoredLamp.java | 2 +- .../mod/blocks/BlockCompost.java | 2 +- .../mod/blocks/BlockCrystal.java | 2 +- .../mod/blocks/BlockFurnaceDouble.java | 12 +- .../mod/blocks/BlockGrinder.java | 4 +- .../mod/blocks/BlockInputter.java | 4 +- .../mod/blocks/BlockItemViewerHopping.java | 4 +- .../mod/blocks/BlockLaserRelay.java | 4 +- .../blocks/BlockLavaFactoryController.java | 4 +- .../mod/blocks/BlockMiner.java | 2 +- .../mod/blocks/BlockMisc.java | 2 +- .../mod/blocks/BlockPhantom.java | 10 +- .../mod/blocks/BlockPlayerInterface.java | 4 +- .../mod/blocks/BlockTinyTorch.java | 13 +- .../mod/blocks/BlockTreasureChest.java | 12 +- .../mod/blocks/BlockWildPlant.java | 2 +- .../mod/blocks/base/BlockBase.java | 7 +- .../mod/blocks/base/BlockBushBase.java | 7 +- .../mod/blocks/base/BlockContainerBase.java | 7 +- .../mod/blocks/base/BlockPlant.java | 7 +- .../mod/blocks/base/BlockStair.java | 7 +- .../mod/blocks/render/IHasModel.java | 7 + .../mod/blocks/render/RenderBatteryBox.java | 8 +- .../mod/blocks/render/RenderCompost.java | 2 +- .../mod/blocks/render/RenderDisplayStand.java | 2 +- .../mod/blocks/render/RenderEmpowerer.java | 2 +- .../mod/blocks/render/RenderLaserRelay.java | 2 +- .../render/RenderReconstructorLens.java | 2 +- .../mod/blocks/render/RenderSmileyCloud.java | 2 +- .../mod/booklet/InitBooklet.java | 48 +++- .../mod/booklet/button/BookmarkButton.java | 10 +- .../mod/booklet/button/EntryButton.java | 10 +- .../mod/booklet/button/TrialsButton.java | 6 +- .../mod/booklet/gui/GuiBooklet.java | 29 +-- .../mod/booklet/gui/GuiEntry.java | 2 +- .../mod/booklet/gui/GuiMainPage.java | 12 +- .../mod/booklet/gui/GuiPage.java | 16 +- .../mod/booklet/page/ItemDisplay.java | 8 +- .../mod/booklet/page/PageCoffeeMachine.java | 4 +- .../mod/booklet/page/PageCrafting.java | 16 +- .../mod/config/GuiConfiguration.java | 6 +- .../mod/crafting/BlockCrafting.java | 5 +- .../mod/crafting/InitCrafting.java | 6 +- .../mod/crafting/RecipeBioMash.java | 8 +- .../mod/crafting/RecipeKeepDataShaped.java | 3 +- .../mod/crafting/RecipeKeepDataShapeless.java | 3 +- .../crafting/RecipePotionRingCharging.java | 7 +- .../mod/crafting/ToolCrafting.java | 4 +- .../mod/data/PlayerData.java | 10 +- .../mod/event/ClientEvents.java | 4 +- .../mod/event/CommonEvents.java | 8 +- .../mod/fluids/InitFluids.java | 4 +- .../handler/VillageJamHouseHandler.java | 6 +- .../mod/inventory/ContainerBag.java | 12 +- .../mod/inventory/ContainerCrafter.java | 2 +- .../mod/inventory/GuiFireworkBox.java | 2 +- .../mod/inventory/gui/EnergyDisplay.java | 4 +- .../mod/inventory/gui/FilterSettingsGui.java | 16 +- .../mod/inventory/gui/FluidDisplay.java | 4 +- .../mod/inventory/gui/GuiBag.java | 6 +- .../mod/inventory/gui/GuiBioReactor.java | 4 +- .../mod/inventory/gui/GuiBreaker.java | 2 +- .../mod/inventory/gui/GuiCanolaPress.java | 2 +- .../mod/inventory/gui/GuiCoalGenerator.java | 2 +- .../mod/inventory/gui/GuiCoffeeMachine.java | 2 +- .../mod/inventory/gui/GuiCrafter.java | 2 +- .../inventory/gui/GuiDirectionalBreaker.java | 2 +- .../mod/inventory/gui/GuiDrill.java | 2 +- .../mod/inventory/gui/GuiDropper.java | 2 +- .../mod/inventory/gui/GuiEnergizer.java | 2 +- .../mod/inventory/gui/GuiEnervator.java | 2 +- .../mod/inventory/gui/GuiFarmer.java | 2 +- .../mod/inventory/gui/GuiFeeder.java | 2 +- .../inventory/gui/GuiFermentingBarrel.java | 2 +- .../mod/inventory/gui/GuiFilter.java | 2 +- .../mod/inventory/gui/GuiFluidCollector.java | 2 +- .../mod/inventory/gui/GuiFurnaceDouble.java | 2 +- .../mod/inventory/gui/GuiGiantChest.java | 6 +- .../mod/inventory/gui/GuiGrinder.java | 2 +- .../mod/inventory/gui/GuiInputter.java | 48 ++-- .../gui/GuiLaserRelayItemWhitelist.java | 8 +- .../mod/inventory/gui/GuiMiner.java | 4 +- .../mod/inventory/gui/GuiOilGenerator.java | 6 +- .../mod/inventory/gui/GuiPhantomPlacer.java | 4 +- .../mod/inventory/gui/GuiRangedCollector.java | 2 +- .../mod/inventory/gui/GuiRepairer.java | 2 +- .../mod/inventory/gui/GuiSmileyCloud.java | 4 +- .../mod/inventory/gui/GuiWtfMojang.java | 2 +- .../mod/inventory/gui/GuiXPSolidifier.java | 4 +- .../mod/inventory/gui/TexturedButton.java | 14 +- .../mod/items/ItemAxeAA.java | 7 +- .../mod/items/ItemBattery.java | 4 +- .../mod/items/ItemBooklet.java | 12 +- .../mod/items/ItemCoffee.java | 9 +- .../mod/items/ItemCrystal.java | 2 +- .../mod/items/ItemCrystalShard.java | 2 +- .../mod/items/ItemDrill.java | 2 +- .../actuallyadditions/mod/items/ItemDust.java | 2 +- .../mod/items/ItemEngineerGoggles.java | 6 +- .../mod/items/ItemFilter.java | 4 +- .../mod/items/ItemFoods.java | 2 +- .../actuallyadditions/mod/items/ItemJams.java | 2 +- .../mod/items/ItemKnife.java | 1 + .../mod/items/ItemMagnetRing.java | 6 +- .../actuallyadditions/mod/items/ItemMisc.java | 4 +- .../mod/items/ItemPotionRing.java | 2 +- .../mod/items/ItemSolidifiedExperience.java | 2 +- .../mod/items/ItemTeleStaff.java | 6 +- .../mod/items/ItemWingsOfTheBats.java | 2 +- .../mod/items/base/ItemEnergy.java | 2 +- .../mod/items/lens/LensColor.java | 12 +- .../mod/items/lens/LensDisenchanting.java | 6 +- .../mod/items/lens/LensDisruption.java | 6 +- .../mod/jei/RecipeWrapperWithButton.java | 2 +- .../mod/jei/booklet/BookletRecipeWrapper.java | 12 +- .../coffee/CoffeeMachineRecipeWrapper.java | 6 +- .../mod/jei/crusher/CrusherRecipeWrapper.java | 8 +- .../ReconstructorRecipeWrapper.java | 2 +- .../mod/misc/DungeonLoot.java | 6 +- .../mod/misc/apiimpl/MethodHandler.java | 8 +- .../farmer/MelonPumpkinFarmerBehavior.java | 4 +- .../mod/misc/special/RenderSpecial.java | 2 +- .../mod/proxy/ClientProxy.java | 31 ++- .../mod/recipe/CrusherRecipeRegistry.java | 4 +- .../mod/tile/FilterSettings.java | 3 +- .../mod/tile/TileEntityBatteryBox.java | 6 +- .../tile/TileEntityDirectionalBreaker.java | 4 +- .../mod/tile/TileEntityEmpowerer.java | 8 +- .../mod/tile/TileEntityFeeder.java | 4 +- .../mod/tile/TileEntityFishingNet.java | 4 +- .../mod/tile/TileEntityItemViewerHopping.java | 8 +- .../mod/tile/TileEntityPhantomPlacer.java | 16 +- .../mod/tile/TileEntityPhantomface.java | 12 +- .../mod/tile/TileEntityRangedCollector.java | 4 +- .../mod/tile/TileEntityShockSuppressor.java | 6 +- .../mod/update/ThreadUpdateChecker.java | 8 +- .../actuallyadditions/mod/util/AssetUtil.java | 14 +- .../actuallyadditions/mod/util/AwfulUtil.java | 11 +- .../actuallyadditions/mod/util/ItemUtil.java | 5 +- .../actuallyadditions/mod/util/WorldUtil.java | 2 +- .../mod/util/crafting/RecipeHandler.java | 146 +---------- .../mod/util/crafting/RecipeHelper.java | 233 ++++++++++++++++++ .../blockstates/block_black_lotus.json | 32 ++- 151 files changed, 768 insertions(+), 566 deletions(-) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java diff --git a/.gitignore b/.gitignore index ae3937ec4..e523feb61 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,11 @@ /*.ipr /*.iws /lib -/classes \ No newline at end of file +/classes +/bin/ + +*.classpath +*.project +.settings/org.eclipse.buildship.core.prefs +*.launch +.settings/org.eclipse.jdt.core.prefs \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7a7702640..5c1c33925 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ minecraft { version = "1.12-14.21.1.2387" runDir = "idea" - mappings = "snapshot_20161220" + mappings = "snapshot_20170628" makeObfSourceJar = false //useDepAts = true @@ -49,7 +49,7 @@ repositories { dependencies { compile "net.darkhax.tesla:Tesla-1.12:1.0.59" deobfCompile "mezz.jei:jei_1.12:4.7.0.68" - deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.3-115" + compileOnly "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.3-115" } processResources { diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletPage.java b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletPage.java index 663647332..44fc83bd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletPage.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.api.booklet; +import java.util.List; + import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; @@ -17,8 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public interface IBookletPage{ void getItemStacksForPage(List list); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 08afad040..1723d9a73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; import de.ellpeck.actuallyadditions.mod.data.WorldData; import de.ellpeck.actuallyadditions.mod.entity.InitEntities; import de.ellpeck.actuallyadditions.mod.event.CommonEvents; @@ -28,11 +27,9 @@ import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials; import de.ellpeck.actuallyadditions.mod.material.InitToolMaterials; import de.ellpeck.actuallyadditions.mod.misc.BannerHelper; -import de.ellpeck.actuallyadditions.mod.misc.SoundHandler; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.LaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.MethodHandler; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.ore.InitOreDict; import de.ellpeck.actuallyadditions.mod.proxy.IProxy; import de.ellpeck.actuallyadditions.mod.recipe.EmpowererHandler; import de.ellpeck.actuallyadditions.mod.recipe.FuelHandler; @@ -52,7 +49,11 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.*; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartedEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; @Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, guiFactory = "de.ellpeck.actuallyadditions.mod.config.GuiFactory") public class ActuallyAdditions{ @@ -111,6 +112,8 @@ public class ActuallyAdditions{ CompatUtil.registerCraftingTweaksCompat(); proxy.init(event); + + RegistryHandler.BLOCKS_TO_REGISTER.clear(); ModUtil.LOGGER.info("Initialization Finished."); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java index 004e3c772..996fec9b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java @@ -1,5 +1,6 @@ package de.ellpeck.actuallyadditions.mod; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.util.FluidStateMapper; import net.minecraft.block.Block; @@ -20,6 +21,10 @@ public class ClientRegistryHandler{ @SubscribeEvent public void onModelRegistry(ModelRegistryEvent event){ + for(Block block : RegistryHandler.BLOCKS_TO_REGISTER){ + if(block instanceof IHasModel) ((IHasModel) block).registerRendering(); + } + for(Map.Entry entry : MODEL_LOCATIONS_FOR_REGISTERING.entrySet()){ ModelLoader.setCustomModelResourceLocation(entry.getKey().getItem(), entry.getKey().getItemDamage(), entry.getValue()); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java index 37a664454..d644ecfad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java @@ -1,5 +1,8 @@ package de.ellpeck.actuallyadditions.mod; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager; @@ -14,9 +17,6 @@ import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; -import java.util.ArrayList; -import java.util.List; - //Class to wrap around the trainwreck that is the new registry system public class RegistryHandler{ @@ -32,7 +32,6 @@ public class RegistryHandler{ for(Block block : BLOCKS_TO_REGISTER){ event.getRegistry().register(block); } - BLOCKS_TO_REGISTER.clear(); } @SubscribeEvent 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 68f51e7b2..70a32f212 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -121,7 +121,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud AssetUtil.renderStackToGui(slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-19, 1F); } - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-15, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-15, StringUtil.DECIMAL_COLOR_WHITE); } } 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 2ef2abd04..92ff2cc28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -11,6 +11,8 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.Random; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; @@ -25,14 +27,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; - public class BlockCoalGenerator extends BlockContainerBase{ public BlockCoalGenerator(String name){ 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 3ebcaa3f4..5e61ef70a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -119,7 +119,7 @@ public class BlockColoredLamp extends BlockBase{ } @Override - protected void registerRendering(){ + public void registerRendering(){ for(int i = 0; i < ALL_LAMP_TYPES.length; i++){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), this.getRegistryName(), TYPE.getName()+"="+ALL_LAMP_TYPES[i].regName); } 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 6df3aaa6b..8bcc31a7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -166,7 +166,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ AssetUtil.renderStackToGui(slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-29, 1F); } - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-25, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-25, StringUtil.DECIMAL_COLOR_WHITE); } } } 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 2ae5f09e6..e6074e6c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -61,7 +61,7 @@ public class BlockCrystal extends BlockBase{ } @Override - protected void registerRendering(){ + public void registerRendering(){ for(int i = 0; i < ALL_CRYSTALS.length; i++){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), this.getRegistryName(), TYPE.getName()+"="+ALL_CRYSTALS[i].name); } 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 da1609583..0d3c73a13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.List; +import java.util.Random; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; @@ -30,7 +33,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; @@ -38,9 +45,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; -import java.util.Random; - public class BlockFurnaceDouble extends BlockContainerBase{ public static final PropertyBool IS_ON = PropertyBool.create("on"); 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 5a6908c30..d0d5c248e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.Random; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; @@ -32,8 +34,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; - public class BlockGrinder extends BlockContainerBase{ private final boolean isDouble; 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 522f10078..2a5a45846 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -11,6 +11,8 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.Random; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; @@ -32,8 +34,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.Random; - public class BlockInputter extends BlockContainerBase{ public static final int NAME_FLAVOR_AMOUNTS = 15; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java index 3c709d231..06744b397 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java @@ -76,8 +76,8 @@ public class BlockItemViewerHopping extends BlockItemViewer{ return this.getDefaultState().withProperty(FACING, opp == EnumFacing.UP ? EnumFacing.DOWN : opp); } - @Override - public boolean isFullyOpaque(IBlockState state){ + @Override //was isFullyOpaque, not sure if correct change. + public boolean isNormalCube(IBlockState state){ return true; } 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 263818fa2..21ebdbf26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -257,7 +257,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{ TileEntityLaserRelay relay = (TileEntityLaserRelay)tile; String strg = relay.getExtraDisplayString(); - minecraft.fontRendererObj.drawStringWithShadow(strg, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(strg, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, StringUtil.DECIMAL_COLOR_WHITE); String expl; if(compass){ @@ -267,7 +267,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{ expl = TextFormatting.GRAY.toString()+TextFormatting.ITALIC+StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".laserRelay.mode.noCompasss", StringUtil.localize(ConfigValues.itemCompassConfigurator.getUnlocalizedName()+".name")); } - StringUtil.drawSplitString(minecraft.fontRendererObj, expl, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+15, Integer.MAX_VALUE, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, expl, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+15, Integer.MAX_VALUE, StringUtil.DECIMAL_COLOR_WHITE, true); } } } 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 3308f9781..d65096a36 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -55,10 +55,10 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IH if(factory != null){ int state = factory.isMultiblock(); if(state == TileEntityLavaFactoryController.NOT_MULTI){ - StringUtil.drawSplitString(minecraft.fontRendererObj, StringUtil.localize("tooltip."+ModUtil.MOD_ID+".factory.notPart.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, 200, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, StringUtil.localize("tooltip."+ModUtil.MOD_ID+".factory.notPart.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, 200, StringUtil.DECIMAL_COLOR_WHITE, true); } else if(state == TileEntityLavaFactoryController.HAS_AIR || state == TileEntityLavaFactoryController.HAS_LAVA){ - StringUtil.drawSplitString(minecraft.fontRendererObj, StringUtil.localize("tooltip."+ModUtil.MOD_ID+".factory.works.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, 200, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, StringUtil.localize("tooltip."+ModUtil.MOD_ID+".factory.works.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, 200, StringUtil.DECIMAL_COLOR_WHITE, true); } } } 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 c6c4d72f6..643422641 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -77,7 +77,7 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{ if(tile instanceof TileEntityMiner){ TileEntityMiner miner = (TileEntityMiner)tile; String info = miner.checkY == 0 ? "Done Mining!" : (miner.checkY == -1 ? "Calculating positions..." : "Mining at "+(miner.getPos().getX()+miner.checkX)+", "+miner.checkY+", "+(miner.getPos().getZ()+miner.checkZ)+"."); - minecraft.fontRendererObj.drawStringWithShadow(info, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-20, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(info, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-20, StringUtil.DECIMAL_COLOR_WHITE); } } } \ No newline at end of file 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 910511213..cc56cf8c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -58,7 +58,7 @@ public class BlockMisc extends BlockBase{ } @Override - protected void registerRendering(){ + public void registerRendering(){ for(int i = 0; i < ALL_MISC_BLOCKS.length; i++){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), this.getRegistryName(), TYPE.getName()+"="+ALL_MISC_BLOCKS[i].name); } 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 3eaf5cc15..0fbbdc938 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -128,24 +128,24 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{ if(tile != null){ if(tile instanceof IPhantomTile){ IPhantomTile phantom = (IPhantomTile)tile; - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".blockPhantomRange.desc")+": "+phantom.getRange(), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-40, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.GOLD+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".blockPhantomRange.desc")+": "+phantom.getRange(), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-40, StringUtil.DECIMAL_COLOR_WHITE); if(phantom.hasBoundPosition()){ int distance = MathHelper.ceil(new Vec3d(posHit.getBlockPos()).distanceTo(new Vec3d(phantom.getBoundPosition()))); IBlockState state = minecraft.world.getBlockState(phantom.getBoundPosition()); Block block = state.getBlock(); Item item = Item.getItemFromBlock(block); String name = item == null ? "Something Unrecognizable" : item.getItemStackDisplayName(new ItemStack(block, 1, block.getMetaFromState(state))); - StringUtil.drawSplitString(minecraft.fontRendererObj, StringUtil.localizeFormatted("tooltip."+ModUtil.MOD_ID+".phantom.blockInfo.desc", name, phantom.getBoundPosition().getX(), phantom.getBoundPosition().getY(), phantom.getBoundPosition().getZ(), distance), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-30, 200, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, StringUtil.localizeFormatted("tooltip."+ModUtil.MOD_ID+".phantom.blockInfo.desc", name, phantom.getBoundPosition().getX(), phantom.getBoundPosition().getY(), phantom.getBoundPosition().getZ(), distance), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-30, 200, StringUtil.DECIMAL_COLOR_WHITE, true); if(phantom.isBoundThingInRange()){ - StringUtil.drawSplitString(minecraft.fontRendererObj, TextFormatting.DARK_GREEN+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.connectedRange.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, 200, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, TextFormatting.DARK_GREEN+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.connectedRange.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, 200, StringUtil.DECIMAL_COLOR_WHITE, true); } else{ - StringUtil.drawSplitString(minecraft.fontRendererObj, TextFormatting.DARK_RED+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.connectedNoRange.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, 200, StringUtil.DECIMAL_COLOR_WHITE, true); + StringUtil.drawSplitString(minecraft.fontRenderer, TextFormatting.DARK_RED+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.connectedNoRange.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, 200, StringUtil.DECIMAL_COLOR_WHITE, true); } } else{ - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.RED+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.notConnected.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.RED+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".phantom.notConnected.desc"), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+25, StringUtil.DECIMAL_COLOR_WHITE); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java index bcbd94f72..e8a9791b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java @@ -74,8 +74,8 @@ public class BlockPlayerInterface extends BlockContainerBase implements IHudDisp if(tile instanceof TileEntityPlayerInterface){ TileEntityPlayerInterface face = (TileEntityPlayerInterface)tile; String name = face.playerName == null ? "Unknown" : face.playerName; - minecraft.fontRendererObj.drawStringWithShadow("Bound to: "+TextFormatting.RED+name, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, StringUtil.DECIMAL_COLOR_WHITE); - minecraft.fontRendererObj.drawStringWithShadow("UUID: "+TextFormatting.DARK_GREEN+face.connectedPlayer, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+15, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow("Bound to: "+TextFormatting.RED+name, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+5, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow("UUID: "+TextFormatting.DARK_GREEN+face.connectedPlayer, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+15, StringUtil.DECIMAL_COLOR_WHITE); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java index 1716125fa..544b576af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java @@ -10,6 +10,10 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.Random; + +import javax.annotation.Nullable; + import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; @@ -18,7 +22,11 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.*; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -26,9 +34,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.Random; - //Copied from BlockTorch. //I have no idea what all of this means. public class BlockTinyTorch extends BlockBase{ 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 a300f0c4e..ea0fe5275 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.blocks; +import java.util.Random; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; @@ -27,15 +29,19 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; - public class BlockTreasureChest extends BlockBase{ public BlockTreasureChest(String name){ 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 8e85a3b33..6d51063e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -94,7 +94,7 @@ public class BlockWildPlant extends BlockBushBase{ } @Override - protected void registerRendering(){ + public void registerRendering(){ for(int i = 0; i < ALL_WILD_PLANTS.length; i++){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), this.getRegistryName(), TYPE.getName()+"="+ALL_WILD_PLANTS[i].name); } 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 19bad46a5..50ef2a616 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 @@ -11,13 +11,14 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockBase extends Block implements ItemBlockBase.ICustomRarity{ +public class BlockBase extends Block implements ItemBlockBase.ICustomRarity, IHasModel{ private final String name; @@ -30,8 +31,6 @@ public class BlockBase extends Block implements ItemBlockBase.ICustomRarity{ private void register(){ ItemUtil.registerBlock(this, this.getItemBlock(), this.getBaseName(), this.shouldAddCreative()); - - this.registerRendering(); } protected String getBaseName(){ @@ -46,7 +45,7 @@ public class BlockBase extends Block implements ItemBlockBase.ICustomRarity{ return true; } - protected void registerRendering(){ + public void registerRendering(){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } 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 5c18bbb40..47da2734d 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 @@ -11,13 +11,14 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import net.minecraft.block.BlockBush; import net.minecraft.block.SoundType; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockBushBase extends BlockBush implements ItemBlockBase.ICustomRarity{ +public class BlockBushBase extends BlockBush implements ItemBlockBase.ICustomRarity, IHasModel{ private final String name; @@ -30,8 +31,6 @@ public class BlockBushBase extends BlockBush implements ItemBlockBase.ICustomRar private void register(){ ItemUtil.registerBlock(this, this.getItemBlock(), this.getBaseName(), this.shouldAddCreative()); - - this.registerRendering(); } protected String getBaseName(){ @@ -46,7 +45,7 @@ public class BlockBushBase extends BlockBush implements ItemBlockBase.ICustomRar return true; } - protected void registerRendering(){ + public void registerRendering(){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } 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 1f84c980d..d605a5acc 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 @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase; @@ -46,7 +47,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public abstract class BlockContainerBase extends BlockContainer implements ItemBlockBase.ICustomRarity{ +public abstract class BlockContainerBase extends BlockContainer implements ItemBlockBase.ICustomRarity, IHasModel{ private final String name; @@ -59,8 +60,6 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB private void register(){ ItemUtil.registerBlock(this, this.getItemBlock(), this.getBaseName(), this.shouldAddCreative()); - - this.registerRendering(); } protected String getBaseName(){ @@ -75,7 +74,7 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB return true; } - protected void registerRendering(){ + public void registerRendering(){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } 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 3ccb4aed2..be10921a4 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 @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.block.BlockCrops; @@ -30,7 +31,7 @@ import net.minecraftforge.common.EnumPlantType; import java.util.List; import java.util.Random; -public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarity{ +public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarity, IHasModel{ private final String name; private final int minDropAmount; @@ -54,8 +55,6 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit private void register(){ ItemUtil.registerBlock(this, this.getItemBlock(), this.getBaseName(), this.shouldAddCreative()); - - this.registerRendering(); } protected String getBaseName(){ @@ -70,7 +69,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit return false; } - protected void registerRendering(){ + public void registerRendering(){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } 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 88efe5130..7394e8812 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 @@ -12,13 +12,14 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRarity{ +public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRarity, IHasModel{ private final String name; @@ -36,8 +37,6 @@ public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRari private void register(){ ItemUtil.registerBlock(this, this.getItemBlock(), this.getBaseName(), this.shouldAddCreative()); - - this.registerRendering(); } protected String getBaseName(){ @@ -52,7 +51,7 @@ public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRari return true; } - protected void registerRendering(){ + public void registerRendering(){ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), this.getRegistryName(), "inventory"); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java new file mode 100644 index 000000000..2dfd4c183 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java @@ -0,0 +1,7 @@ +package de.ellpeck.actuallyadditions.mod.blocks.render; + +public interface IHasModel { + + public void registerRendering(); + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java index 212018c55..d82251d14 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; +import java.text.NumberFormat; + import de.ellpeck.actuallyadditions.mod.items.ItemBattery; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; @@ -27,13 +29,11 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.text.NumberFormat; - @SideOnly(Side.CLIENT) public class RenderBatteryBox extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ if(!(tile instanceof TileEntityBatteryBox)){ return; } @@ -52,7 +52,7 @@ public class RenderBatteryBox extends TileEntitySpecialRenderer{ if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){ IEnergyStorage cap = stack.getCapability(CapabilityEnergy.ENERGY, null); NumberFormat format = NumberFormat.getInstance(); - FontRenderer font = Minecraft.getMinecraft().fontRendererObj; + FontRenderer font = Minecraft.getMinecraft().fontRenderer; String s = format.format(cap.getEnergyStored())+"/"+format.format(cap.getMaxEnergyStored()); float lengthS = -font.getStringWidth(s)/2F; 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 1903d6966..5a3923439 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 @@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class RenderCompost extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage, float f){ + public void render(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage, float f){ if(te instanceof TileEntityCompost){ TileEntityCompost compost = (TileEntityCompost)te; ItemStack slot = compost.slots.getStackInSlot(0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java index fe6ebc161..c87ef32b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class RenderDisplayStand extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ if(!(tile instanceof TileEntityDisplayStand)){ return; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java index 8b1c9ff02..fa80856b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class RenderEmpowerer extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ if(!(tile instanceof TileEntityEmpowerer)){ return; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java index b193e1549..66ba2eb70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java @@ -41,7 +41,7 @@ public class RenderLaserRelay extends TileEntitySpecialRenderer{ private static final float[] COLOR_INFRARED = new float[]{209F/255F, 179F/255F, 239F/255F}; @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ if(tile instanceof TileEntityLaserRelay){ TileEntityLaserRelay relay = (TileEntityLaserRelay)tile; boolean hasInvis = false; 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 1c7a0f9b0..22644f3b0 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 @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class RenderReconstructorLens extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int par6, float f){ 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 64740fc78..f2f7b6cb6 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 @@ -32,7 +32,7 @@ import java.util.Locale; public class RenderSmileyCloud extends TileEntitySpecialRenderer{ @Override - public void func_192841_a(TileEntity tile, double x, double y, double z, float par5, int partial, float f){ + public void render(TileEntity tile, double x, double y, double z, float par5, int partial, float f){ if(tile instanceof TileEntitySmileyCloud){ TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile; 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 652b6a839..a3ed0096f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -10,6 +10,12 @@ package de.ellpeck.actuallyadditions.mod.booklet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; @@ -24,8 +30,21 @@ import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterTrials; import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllItems; import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryTrials; -import de.ellpeck.actuallyadditions.mod.booklet.page.*; -import de.ellpeck.actuallyadditions.mod.crafting.*; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrafting; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrusherRecipe; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageEmpowerer; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageFurnace; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageLinkButton; +import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageReconstructor; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageTextOnly; +import de.ellpeck.actuallyadditions.mod.crafting.BlockCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.FoodCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.MiscCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.ToolCrafting; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.gen.OreGen; import de.ellpeck.actuallyadditions.mod.gen.WorldGenLushCaves; @@ -38,7 +57,28 @@ import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.recipe.EmpowererHandler; -import de.ellpeck.actuallyadditions.mod.tile.*; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyAdvanced; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyExtreme; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomface; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; import de.ellpeck.actuallyadditions.mod.update.UpdateChecker; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.Util; @@ -50,8 +90,6 @@ import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.UniversalBucket; -import java.util.*; - public final class InitBooklet{ public static BookletChapter[] chaptersIntroduction = new BookletChapter[11]; 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 a98f956b2..3b121fb21 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 @@ -61,11 +61,11 @@ public class BookmarkButton extends GuiButton{ } @Override - public void func_191745_a(Minecraft minecraft, int x, int y, float f){ + public void drawButton(Minecraft minecraft, int x, int y, float f){ if(this.visible){ minecraft.getTextureManager().bindTexture(GuiBooklet.RES_LOC_GADGETS); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; + this.hovered = x >= this.x && y >= this.y && x < this.x+this.width && y < this.y+this.height; int k = this.getHoverState(this.hovered); if(k == 0){ k = 1; @@ -75,14 +75,14 @@ public class BookmarkButton extends GuiButton{ GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); int renderHeight = 25; - this.drawTexturedModalRect(this.xPosition, this.yPosition, 224+(this.assignedPage == null ? 0 : 16), 14-renderHeight+k*renderHeight, this.width, renderHeight); + this.drawTexturedModalRect(this.x, this.y, 224+(this.assignedPage == null ? 0 : 16), 14-renderHeight+k*renderHeight, this.width, renderHeight); this.mouseDragged(minecraft, x, y); if(this.assignedPage != null){ ItemStack display = this.assignedPage.getChapter().getDisplayItemStack(); if(StackUtil.isValid(display)){ GlStateManager.pushMatrix(); - AssetUtil.renderStackToGui(display, this.xPosition+2, this.yPosition+1, 0.725F); + AssetUtil.renderStackToGui(display, this.x+2, this.y+1, 0.725F); GlStateManager.popMatrix(); } } @@ -112,7 +112,7 @@ public class BookmarkButton extends GuiButton{ } Minecraft mc = Minecraft.getMinecraft(); - GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java index e4dfa3edd..948ffef4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java @@ -34,10 +34,10 @@ public class EntryButton extends GuiButton{ } @Override - public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float f){ + public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float f){ 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; + this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x+this.width && mouseY < this.y+this.height; GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); @@ -46,7 +46,7 @@ public class EntryButton extends GuiButton{ int textOffsetX = 0; if(StackUtil.isValid(this.stackToRender)){ GlStateManager.pushMatrix(); - AssetUtil.renderStackToGui(this.stackToRender, this.xPosition-4, this.yPosition, 0.725F); + AssetUtil.renderStackToGui(this.stackToRender, this.x-4, this.y, 0.725F); GlStateManager.popMatrix(); textOffsetX = 10; } @@ -55,11 +55,11 @@ public class EntryButton extends GuiButton{ if(this.hovered){ GlStateManager.pushMatrix(); - AssetUtil.drawHorizontalGradientRect(this.xPosition+textOffsetX-1, this.yPosition+this.height-1, this.xPosition+(int)(minecraft.fontRendererObj.getStringWidth(this.displayString)*scale)+textOffsetX+1, this.yPosition+this.height, 0x80 << 24 | 22271, 22271, this.zLevel); + AssetUtil.drawHorizontalGradientRect(this.x+textOffsetX-1, this.y+this.height-1, this.x+(int)(minecraft.fontRenderer.getStringWidth(this.displayString)*scale)+textOffsetX+1, this.y+this.height, 0x80 << 24 | 22271, 22271, this.zLevel); GlStateManager.popMatrix(); } - StringUtil.renderScaledAsciiString(minecraft.fontRendererObj, this.displayString, this.xPosition+textOffsetX, this.yPosition+2+(this.height-8)/2, 0, false, scale); + StringUtil.renderScaledAsciiString(minecraft.fontRenderer, this.displayString, this.x+textOffsetX, this.y+2+(this.height-8)/2, 0, false, scale); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java index 2a2bad636..1493e138f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java @@ -27,12 +27,12 @@ public class TrialsButton extends TexturedButton{ } @Override - public void func_191745_a(Minecraft minecraft, int x, int y, float f){ - super.func_191745_a(minecraft, x, y, f); + public void drawButton(Minecraft minecraft, int x, int y, float f){ + super.drawButton(minecraft, x, y, f); if(this.visible){ if(this.hovered || this.isTrials){ - this.drawCenteredString(minecraft.fontRendererObj, StringUtil.localize("booklet."+ModUtil.MOD_ID+".trialsButton.name"), this.xPosition+(this.width-8)/2, this.yPosition+(this.height-8)/2, 14737632); + this.drawCenteredString(minecraft.fontRenderer, StringUtil.localize("booklet."+ModUtil.MOD_ID+".trialsButton.name"), this.x+(this.width-8)/2, this.y+(this.height-8)/2, 14737632); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java index bda7702e6..eedf0057a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java @@ -10,6 +10,14 @@ package de.ellpeck.actuallyadditions.mod.booklet.gui; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + +import org.apache.commons.lang3.ArrayUtils; +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton; @@ -30,13 +38,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.ArrayUtils; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; @SideOnly(Side.CLIENT) public abstract class GuiBooklet extends GuiBookletBase{ @@ -115,7 +116,7 @@ public abstract class GuiBooklet extends GuiBookletBase{ } if(this.hasSearchBar()){ - this.searchField = new GuiTextField(-420, this.fontRendererObj, this.guiLeft+this.xSize+2, this.guiTop+this.ySize-40+2, 64, 12); + this.searchField = new GuiTextField(-420, this.fontRenderer, this.guiLeft+this.xSize+2, this.guiTop+this.ySize-40+2, 64, 12); this.searchField.setMaxStringLength(50); this.searchField.setEnableBackgroundDrawing(false); } @@ -177,16 +178,16 @@ public abstract class GuiBooklet extends GuiBookletBase{ this.mc.getTextureManager().bindTexture(RES_LOC_GADGETS); this.drawTexturedModalRect(this.guiLeft+this.xSize, this.guiTop+this.ySize-40, 188, 0, 68, 14); - boolean unicodeBefore = this.fontRendererObj.getUnicodeFlag(); - this.fontRendererObj.setUnicodeFlag(true); + boolean unicodeBefore = this.fontRenderer.getUnicodeFlag(); + this.fontRenderer.setUnicodeFlag(true); if(!this.searchField.isFocused() && (this.searchField.getText() == null || this.searchField.getText().isEmpty())){ - this.fontRendererObj.drawString(TextFormatting.ITALIC+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.searchField"), this.guiLeft+this.xSize+2, this.guiTop+this.ySize-40+2, 0xFFFFFF, false); + this.fontRenderer.drawString(TextFormatting.ITALIC+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.searchField"), this.guiLeft+this.xSize+2, this.guiTop+this.ySize-40+2, 0xFFFFFF, false); } this.searchField.drawTextBox(); - this.fontRendererObj.setUnicodeFlag(unicodeBefore); + this.fontRenderer.setUnicodeFlag(unicodeBefore); } } @@ -348,12 +349,12 @@ public abstract class GuiBooklet extends GuiBookletBase{ @Override public void renderScaledAsciiString(String text, int x, int y, int color, boolean shadow, float scale){ - StringUtil.renderScaledAsciiString(this.fontRendererObj, text, x, y, color, shadow, scale); + StringUtil.renderScaledAsciiString(this.fontRenderer, text, x, y, color, shadow, scale); } @Override public void renderSplitScaledAsciiString(String text, int x, int y, int color, boolean shadow, float scale, int length){ - StringUtil.renderSplitScaledAsciiString(this.fontRendererObj, text, x, y, color, shadow, scale, length); + StringUtil.renderSplitScaledAsciiString(this.fontRenderer, text, x, y, color, shadow, scale, length); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java index 4c45557df..02dda6b23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java @@ -68,7 +68,7 @@ public class GuiEntry extends GuiBooklet{ super.drawScreenPre(mouseX, mouseY, partialTicks); String name = this.entry.getLocalizedName(); - this.fontRendererObj.drawString(name, this.guiLeft+this.xSize/2-this.fontRendererObj.getStringWidth(name)/2, this.guiTop-1, 0xFFFFFF, true); + this.fontRenderer.drawString(name, this.guiLeft+this.xSize/2-this.fontRenderer.getStringWidth(name)/2, this.guiTop-1, 0xFFFFFF, true); for(int i = 0; i < 2; i++){ String pageStrg = "Page "+(this.entryPage*2+i+1)+"/"+this.pageAmount*2; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java index 2e5ffa8e0..cd2bb869a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java @@ -127,7 +127,7 @@ public class GuiMainPage extends GuiBooklet{ String usedQuote = QUOTES[this.mc.world.rand.nextInt(QUOTES.length)]; String[] quoteSplit = usedQuote.split("@"); if(quoteSplit.length == 2){ - this.quote = this.fontRendererObj.listFormattedStringToWidth(quoteSplit[0], 120); + this.quote = this.fontRenderer.listFormattedStringToWidth(quoteSplit[0], 120); this.quoteGuy = quoteSplit[1]; } @@ -198,13 +198,13 @@ public class GuiMainPage extends GuiBooklet{ List configText = new ArrayList(); configText.add(TextFormatting.GOLD+StringUtil.localize("booklet."+ModUtil.MOD_ID+".configButton.name")); - configText.addAll(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID+".configButton.desc", ModUtil.NAME).replaceAll("\\\\n", "\n"), 200)); + configText.addAll(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID+".configButton.desc", ModUtil.NAME).replaceAll("\\\\n", "\n"), 200)); this.configButton = new TexturedButton(RES_LOC_GADGETS, -388, this.guiLeft+16, this.guiTop+this.ySize-30, 188, 14, 16, 16, configText); this.buttonList.add(this.configButton); List achievementText = new ArrayList(); achievementText.add(TextFormatting.GOLD+StringUtil.localize("booklet."+ModUtil.MOD_ID+".achievementButton.name")); - achievementText.addAll(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID+".achievementButton.desc", ModUtil.NAME), 200)); + achievementText.addAll(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID+".achievementButton.desc", ModUtil.NAME), 200)); //this.achievementButton = new TexturedButton(RES_LOC_GADGETS, -389, this.guiLeft+36, this.guiTop+this.ySize-30, 204, 14, 16, 16, achievementText); //this.buttonList.add(this.achievementButton); @@ -278,12 +278,12 @@ public class GuiMainPage extends GuiBooklet{ super.drawScreenPre(mouseX, mouseY, partialTicks); String strg = TextFormatting.DARK_GREEN+StringUtil.localize(this.bookletName); - this.fontRendererObj.drawString(strg, this.guiLeft+72-this.fontRendererObj.getStringWidth(strg)/2-3, this.guiTop+19, 0); + this.fontRenderer.drawString(strg, this.guiLeft+72-this.fontRenderer.getStringWidth(strg)/2-3, this.guiTop+19, 0); strg = TextFormatting.DARK_GREEN+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.manualName.2"); - this.fontRendererObj.drawString(strg, this.guiLeft+72-this.fontRendererObj.getStringWidth(strg)/2-3, this.guiTop+19+this.fontRendererObj.FONT_HEIGHT, 0); + this.fontRenderer.drawString(strg, this.guiLeft+72-this.fontRenderer.getStringWidth(strg)/2-3, this.guiTop+19+this.fontRenderer.FONT_HEIGHT, 0); strg = TextFormatting.GOLD+TextFormatting.ITALIC.toString()+this.bookletEdition; - this.fontRendererObj.drawString(strg, this.guiLeft+72-this.fontRendererObj.getStringWidth(strg)/2-3, this.guiTop+40, 0); + this.fontRenderer.drawString(strg, this.guiLeft+72-this.fontRenderer.getStringWidth(strg)/2-3, this.guiTop+40, 0); if(this.showTutorial){ String text = TextFormatting.BLUE+"It looks like this is the first time you are using this manual. \nIf you click the button below, some useful bookmarks will be stored at the bottom of the GUI. You should definitely check them out to get started with "+ModUtil.NAME+"! \nIf you don't want this, shift-click the button."; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java index b8edda401..6cdb9fe6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java @@ -10,6 +10,13 @@ package de.ellpeck.actuallyadditions.mod.booklet.gui; +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; @@ -26,13 +33,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - @SideOnly(Side.CLIENT) public class GuiPage extends GuiBooklet{ @@ -167,7 +167,7 @@ public class GuiPage extends GuiBooklet{ if(this.pages[0] != null){ IBookletChapter chapter = this.pages[0].getChapter(); String name = chapter.getLocalizedName(); - this.fontRendererObj.drawString(name, this.guiLeft+this.xSize/2-this.fontRendererObj.getStringWidth(name)/2, this.guiTop-1, 0xFFFFFF, true); + this.fontRenderer.drawString(name, this.guiLeft+this.xSize/2-this.fontRenderer.getStringWidth(name)/2, this.guiTop-1, 0xFFFFFF, true); } for(int i = 0; i < this.pages.length; i++){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java index eb6cb8d49..d82cca124 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java @@ -56,8 +56,8 @@ public class ItemDisplay{ public void drawPost(int mouseX, int mouseY){ if(this.isHovered(mouseX, mouseY)){ Minecraft mc = this.gui.mc; - boolean flagBefore = mc.fontRendererObj.getUnicodeFlag(); - mc.fontRendererObj.setUnicodeFlag(false); + boolean flagBefore = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(false); List list = this.stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? TooltipFlags.ADVANCED : TooltipFlags.NORMAL); @@ -74,9 +74,9 @@ public class ItemDisplay{ list.add(TextFormatting.GOLD+StringUtil.localize("booklet."+ModUtil.MOD_ID+".clickToSeeRecipe")); } - GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); - mc.fontRendererObj.setUnicodeFlag(flagBefore); + mc.fontRenderer.setUnicodeFlag(flagBefore); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java index 242de69c0..8e2ed15c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; +import java.util.List; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; @@ -21,8 +23,6 @@ import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class PageCoffeeMachine extends BookletPage{ private final CoffeeIngredient ingredient; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java index d5ba00304..a2a72145d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.booklet.page; +import java.util.Arrays; +import java.util.List; + import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -28,9 +31,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import java.util.Arrays; -import java.util.List; - public class PageCrafting extends BookletPage{ private final List recipes; @@ -152,15 +152,15 @@ public class PageCrafting extends BookletPage{ catch(Exception e){ ModUtil.LOGGER.error("Something went wrong trying to get the Crafting Recipe in the booklet to display!", e); } - for(int i = 0; i < shaped.func_192400_c().size(); i++){ - ings[i] = shaped.func_192400_c().get(i); + for(int i = 0; i < shaped.getIngredients().size(); i++){ + ings[i] = shaped.getIngredients().get(i); } this.recipeTypeLocKey = "booklet."+ModUtil.MOD_ID+".shapedOreRecipe"; } else if(recipe instanceof ShapelessOreRecipe){ ShapelessOreRecipe shapeless = (ShapelessOreRecipe)recipe; - for(int i = 0; i < shapeless.func_192400_c().size(); i++){ - ings[i] = shapeless.func_192400_c().get(i); + for(int i = 0; i < shapeless.getIngredients().size(); i++){ + ings[i] = shapeless.getIngredients().get(i); } this.recipeTypeLocKey = "booklet."+ModUtil.MOD_ID+".shapelessOreRecipe"; } @@ -169,7 +169,7 @@ public class PageCrafting extends BookletPage{ for(int y = 0; y < height; y++){ Ingredient ing = ings[y*width+x]; if(ing != null){ - ItemStack[] stacks = ing.func_193365_a(); + ItemStack[] stacks = ing.getMatchingStacks(); if(stacks != null && stacks.length > 0){ ItemStack stack = stacks[0]; if(StackUtil.isValid(stack)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java index ef356acdf..92c8a95ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java @@ -10,15 +10,15 @@ package de.ellpeck.actuallyadditions.mod.config; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; import net.minecraftforge.fml.client.config.IConfigElement; -import java.util.ArrayList; -import java.util.List; - public class GuiConfiguration extends GuiConfig{ public GuiConfiguration(GuiScreen parentScreen){ 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 0f3d6586c..2a5c32ed0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -569,7 +569,6 @@ public final class BlockCrafting{ 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'R', new ItemStack(Items.REPEATER), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), - 'L', new ItemStack(Items.LAVA_BUCKET), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(Blocks.IRON_BARS)); recipeHeatCollector = RecipeUtil.lastIRecipe(); @@ -608,7 +607,6 @@ public final class BlockCrafting{ 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), - 'P', new ItemStack(Blocks.PISTON), 'F', new ItemStack(Items.FLINT)); recipeCrusher = RecipeUtil.lastIRecipe(); @@ -618,8 +616,7 @@ public final class BlockCrafting{ 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', InitBlocks.blockGrinder, - 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), - 'P', new ItemStack(Blocks.PISTON)); + 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())); recipeDoubleCrusher = RecipeUtil.lastIRecipe(); //Double Furnace diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java index 0567a4535..77b70ba0b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java @@ -15,7 +15,11 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.*; +import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.CactusFarmerBehavior; +import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.DefaultFarmerBehavior; +import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.MelonPumpkinFarmerBehavior; +import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.NetherWartFarmerBehavior; +import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.ReedFarmerBehavior; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu.EnderlillyFarmerBehavior; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu.RedOrchidFarmerBehavior; import de.ellpeck.actuallyadditions.mod.util.ModUtil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java index c3b7fff79..6f0f9bfab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java @@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.ItemKnife; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -29,7 +29,7 @@ import net.minecraftforge.registries.IForgeRegistryEntry; public class RecipeBioMash extends IForgeRegistryEntry.Impl implements IRecipe{ public RecipeBioMash(ResourceLocation location){ - RecipeHandler.addRecipe(location, this); + RecipeHelper.addRecipe(location.getResourcePath(), this); } @Override @@ -86,8 +86,8 @@ public class RecipeBioMash extends IForgeRegistryEntry.Impl implements } @Override - public boolean func_194133_a(int p_194133_1_, int p_194133_2_){ - return false; + public boolean canFit(int width, int height){ + return width*height>5; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java index b8b61fc94..08a5a9725 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.crafting; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -26,7 +27,7 @@ public class RecipeKeepDataShaped extends ShapedOreRecipe{ super(group, result, recipe); this.nbtCopyStack = nbtCopyStack; - RecipeHandler.addRecipe(group, this); + RecipeHelper.addRecipe(group.getResourcePath(), this); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java index 43909e79b..e8b77dcba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.crafting; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -26,7 +27,7 @@ public class RecipeKeepDataShapeless extends ShapelessOreRecipe{ super(group, result, recipe); this.nbtCopyStack = nbtCopyStack; - RecipeHandler.addRecipe(group, this); + RecipeHelper.addRecipe(group.getResourcePath(), this); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java index 4f103efc5..2a6294bbd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.crafting; import de.ellpeck.actuallyadditions.mod.items.ItemPotionRing; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ import net.minecraftforge.registries.IForgeRegistryEntry; public class RecipePotionRingCharging extends IForgeRegistryEntry.Impl implements IRecipe{ public RecipePotionRingCharging(ResourceLocation location){ - RecipeHandler.addRecipe(location, this); + RecipeHelper.addRecipe(location.getResourcePath(), this); } @Override @@ -84,8 +85,8 @@ public class RecipePotionRingCharging extends IForgeRegistryEntry.Impl } @Override - public boolean func_194133_a(int p_194133_1_, int p_194133_2_){ - return false; + public boolean canFit(int width, int height){ + return width*height>3; } @Override 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 4ba455eac..a18a370b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.crafting; +import java.util.ArrayList; + import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; @@ -21,8 +23,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import java.util.ArrayList; - public final class ToolCrafting{ public static final ArrayList RECIPES_PAXELS = new ArrayList(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java index b124ed2f9..1be0ceeb8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java @@ -10,6 +10,11 @@ package de.ellpeck.actuallyadditions.mod.data; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; @@ -20,11 +25,6 @@ import net.minecraft.nbt.NBTTagString; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - public final class PlayerData{ public static PlayerSave getDataFromPlayer(EntityPlayer player){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java index bf4bff790..0e01bf95e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java @@ -94,7 +94,7 @@ public class ClientEvents{ } //Advanced Item Info - if(event.getFlags().func_194127_a() && StackUtil.isValid(event.getItemStack())){ + if(event.getFlags().isAdvanced() && StackUtil.isValid(event.getItemStack())){ if(ConfigBoolValues.CTRL_EXTRA_INFO.isEnabled()){ if(GuiScreen.isCtrlKeyDown()){ event.getToolTip().add(TextFormatting.DARK_GRAY+""+TextFormatting.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".extraInfo.desc")+":"); @@ -177,7 +177,7 @@ public class ClientEvents{ Minecraft minecraft = Minecraft.getMinecraft(); EntityPlayer player = minecraft.player; RayTraceResult posHit = minecraft.objectMouseOver; - FontRenderer font = minecraft.fontRendererObj; + FontRenderer font = minecraft.fontRenderer; ItemStack stack = player.getHeldItemMainhand(); if(StackUtil.isValid(stack)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java index 03fb77ca8..181afb763 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java @@ -67,7 +67,7 @@ public class CommonEvents{ EntityPlayer player = event.getEntityPlayer(); EntityItem item = event.getItem(); if(item != null && !item.isDead){ - ItemStack stack = item.getEntityItem(); + ItemStack stack = item.getItem(); if(StackUtil.isValid(stack)){ for(int i = 0; i < player.inventory.getSizeInventory(); i++){ if(i != player.inventory.currentItem){ @@ -130,7 +130,7 @@ public class CommonEvents{ } } - item.setEntityItemStack(stack); + item.setItem(stack); } } @@ -149,7 +149,7 @@ public class CommonEvents{ @SubscribeEvent public void onEntityDropEvent(LivingDropsEvent event){ - if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getEntity() instanceof EntityPlayer){ + if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer){ //Drop Cobwebs from Spiders if(ConfigBoolValues.DO_SPIDER_DROPS.isEnabled() && event.getEntityLiving() instanceof EntitySpider){ if(event.getEntityLiving().world.rand.nextInt(20) <= event.getLootingLevel()*2){ @@ -198,7 +198,7 @@ public class CommonEvents{ @SubscribeEvent public void onPickupEvent(EntityItemPickupEvent event){ - //checkAchievements(event.getItem().getEntityItem(), event.getEntityPlayer(), InitAchievements.Type.PICK_UP); + //checkAchievements(event.getItem().getItem(), event.getEntityPlayer(), InitAchievements.Type.PICK_UP); } @SubscribeEvent diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java index c015312cb..afd928a5e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.fluids; +import java.util.Locale; + import de.ellpeck.actuallyadditions.mod.blocks.base.BlockFluidFlowing; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -17,8 +19,6 @@ import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import java.util.Locale; - public final class InitFluids{ public static Fluid fluidCanolaOil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java index ddb0de416..3a5704458 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java @@ -10,15 +10,15 @@ package de.ellpeck.actuallyadditions.mod.gen.village.component.handler; +import java.util.List; +import java.util.Random; + import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentJamHouse; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.fml.common.registry.VillagerRegistry; -import java.util.List; -import java.util.Random; - public class VillageJamHouseHandler implements VillagerRegistry.IVillageCreationHandler{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java index 8d7edf47c..d002f6bcb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java @@ -105,12 +105,12 @@ public class ContainerBag extends Container implements IButtonReactor{ if(this.filter.needsUpdateSend() || this.autoInsert != this.oldAutoInsert){ for(IContainerListener listener : this.listeners){ - listener.sendProgressBarUpdate(this, 0, this.filter.isWhitelist ? 1 : 0); - listener.sendProgressBarUpdate(this, 1, this.filter.respectMeta ? 1 : 0); - listener.sendProgressBarUpdate(this, 2, this.filter.respectNBT ? 1 : 0); - listener.sendProgressBarUpdate(this, 3, this.filter.respectOredict); - listener.sendProgressBarUpdate(this, 4, this.autoInsert ? 1 : 0); - listener.sendProgressBarUpdate(this, 5, this.filter.respectMod ? 1 : 0); + listener.sendWindowProperty(this, 0, this.filter.isWhitelist ? 1 : 0); + listener.sendWindowProperty(this, 1, this.filter.respectMeta ? 1 : 0); + listener.sendWindowProperty(this, 2, this.filter.respectNBT ? 1 : 0); + listener.sendWindowProperty(this, 3, this.filter.respectOredict); + listener.sendWindowProperty(this, 4, this.autoInsert ? 1 : 0); + listener.sendWindowProperty(this, 5, this.filter.respectMod ? 1 : 0); } this.filter.updateLasts(); this.oldAutoInsert = this.autoInsert; 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 96b3cdd01..767f9521c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java @@ -119,7 +119,7 @@ public class ContainerCrafter extends Container{ @Override public void onCraftMatrixChanged(IInventory inv){ - this.craftResult.setInventorySlotContents(0, CraftingManager.findMatchingRecipe(this.craftMatrix, this.world)); + this.craftResult.setInventorySlotContents(0, CraftingManager.findMatchingRecipe(this.craftMatrix, this.world).getRecipeOutput()); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java index e1ae4ebc2..ad3914393 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java @@ -71,7 +71,7 @@ public class GuiFireworkBox extends GuiContainer implements GuiResponder{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tile); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tile); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java index 7eb283717..6bd3858a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java @@ -74,7 +74,7 @@ public class EnergyDisplay extends Gui{ } if(this.drawTextNextTo){ - this.drawString(mc.fontRendererObj, this.getOverlayText(), barX+25, barY+78, StringUtil.DECIMAL_COLOR_WHITE); + this.drawString(mc.fontRenderer, this.getOverlayText(), barX+25, barY+78, StringUtil.DECIMAL_COLOR_WHITE); } } @@ -84,7 +84,7 @@ public class EnergyDisplay extends Gui{ List text = new ArrayList(); text.add(this.getOverlayText()); - GuiUtils.drawHoveringText(text, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(text, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java index 5ba2b9b38..4d3611d9c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java @@ -72,22 +72,22 @@ public class FilterSettingsGui extends Gui{ if(this.whitelistButton.isMouseOver()){ List list = new ArrayList(); list.add(TextFormatting.BOLD+(this.theSettings.isWhitelist ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.whitelist") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.blacklist"))); - list.addAll(mc.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".gui.whitelistInfo"), 200)); - GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + list.addAll(mc.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".gui.whitelistInfo"), 200)); + GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } else if(this.metaButton.isMouseOver()){ - GuiUtils.drawHoveringText(Collections.singletonList(TextFormatting.BOLD+(this.theSettings.respectMeta ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectMeta") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.ignoreMeta"))), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(Collections.singletonList(TextFormatting.BOLD+(this.theSettings.respectMeta ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectMeta") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.ignoreMeta"))), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } else if(this.nbtButton.isMouseOver()){ - GuiUtils.drawHoveringText(Collections.singletonList(TextFormatting.BOLD+(this.theSettings.respectNBT ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectNBT") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.ignoreNBT"))), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(Collections.singletonList(TextFormatting.BOLD+(this.theSettings.respectNBT ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectNBT") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.ignoreNBT"))), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } else if(this.modButton.isMouseOver()){ List list = new ArrayList(); list.add(TextFormatting.BOLD+(this.theSettings.respectMod ? StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectMod") : StringUtil.localize("info."+ModUtil.MOD_ID+".gui.ignoreMod"))); - list.addAll(mc.fontRendererObj.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectModInfo"), 200)); + list.addAll(mc.fontRenderer.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectModInfo"), 200)); - GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } else if(this.oredictButton.isMouseOver()){ List list = new ArrayList(); @@ -102,9 +102,9 @@ public class FilterSettingsGui extends Gui{ } if(type != null){ - list.addAll(mc.fontRendererObj.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectOredictInfo."+type), 200)); + list.addAll(mc.fontRenderer.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.respectOredictInfo."+type), 200)); } - GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java index 0f68d09bf..daff4ae74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java @@ -97,14 +97,14 @@ public class FluidDisplay extends Gui{ } if(this.drawTextNextTo){ - this.drawString(mc.fontRendererObj, this.getOverlayText(), barX+25, barY+78, StringUtil.DECIMAL_COLOR_WHITE); + this.drawString(mc.fontRenderer, this.getOverlayText(), barX+25, barY+78, StringUtil.DECIMAL_COLOR_WHITE); } } public void drawOverlay(int mouseX, int mouseY){ if(mouseX >= this.x && mouseY >= this.y && mouseX < this.x+(this.outline ? 26 : 18) && mouseY < this.y+(this.outline ? 93 : 85)){ Minecraft mc = Minecraft.getMinecraft(); - GuiUtils.drawHoveringText(Collections.singletonList(this.getOverlayText()), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(Collections.singletonList(this.getOverlayText()), mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java index 3887bded5..76279f62c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java @@ -82,7 +82,7 @@ public class GuiBag extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+"."+(this.isVoid ? "voidBag" : "bag")+".name")); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+"."+(this.isVoid ? "voidBag" : "bag")+".name")); } @Override @@ -104,8 +104,8 @@ public class GuiBag extends GuiWtfMojang{ if(this.buttonAutoInsert.isMouseOver()){ List text = new ArrayList(); text.add(TextFormatting.BOLD+"Auto-Insert "+(this.container.autoInsert ? "On" : "Off")); - text.addAll(this.mc.fontRendererObj.listFormattedStringToWidth("Turn this on to make items that get picked up automatically go into the bag.", 200)); - text.addAll(this.mc.fontRendererObj.listFormattedStringToWidth(TextFormatting.GRAY+""+TextFormatting.ITALIC+"Note that this WON'T work when you are holding the bag in your hand.", 200)); + text.addAll(this.mc.fontRenderer.listFormattedStringToWidth("Turn this on to make items that get picked up automatically go into the bag.", 200)); + text.addAll(this.mc.fontRenderer.listFormattedStringToWidth(TextFormatting.GRAY+""+TextFormatting.ITALIC+"Note that this WON'T work when you are holding the bag in your hand.", 200)); this.drawHoveringText(text, mouseX, mouseY); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java index ac1719f3d..d84e1f981 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java @@ -45,7 +45,7 @@ public class GuiBioReactor extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tile); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tile); } @Override @@ -64,7 +64,7 @@ public class GuiBioReactor extends GuiWtfMojang{ } if(this.tile.producePerTick > 0){ - this.drawCenteredString(this.fontRendererObj, this.tile.producePerTick+" CF/t", this.guiLeft+87, this.guiTop+86, 0xFFFFFF); + this.drawCenteredString(this.fontRenderer, this.tile.producePerTick+" CF/t", this.guiLeft+87, this.guiTop+86, 0xFFFFFF); } this.energy.draw(); 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 a463aae8e..71c3d2840 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 @@ -35,7 +35,7 @@ public class GuiBreaker extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.breaker); } @Override 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 e02d70ad5..eb487da91 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 @@ -52,7 +52,7 @@ public class GuiCanolaPress extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.press); } @Override 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 73d157fb8..5eebd3ce3 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 @@ -48,7 +48,7 @@ public class GuiCoalGenerator extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.generator); } @Override 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 2af2a0503..0e41012eb 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 @@ -68,7 +68,7 @@ public class GuiCoffeeMachine extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.machine); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.machine); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java index 8826db07d..35d57da88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java @@ -34,7 +34,7 @@ public class GuiCrafter extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".crafting.name")); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".crafting.name")); } @Override 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 55f53f2df..6c8790688 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 @@ -49,7 +49,7 @@ public class GuiDirectionalBreaker extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.breaker); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 46f9ce22a..6385a1b7d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -33,7 +33,7 @@ public class GuiDrill extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".drill.name")); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".drill.name")); } @Override 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 8927c7b68..9fdae20f9 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 @@ -35,7 +35,7 @@ public class GuiDropper extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.dropper); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.dropper); } @Override 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 1ae7e7839..7eeb21dc6 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 @@ -48,7 +48,7 @@ public class GuiEnergizer extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.energizer); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.energizer); } @Override 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 1c55829fb..c5759cbbf 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 @@ -48,7 +48,7 @@ public class GuiEnervator extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.enervator); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.enervator); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java index 0b8756527..2980b2593 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java @@ -44,7 +44,7 @@ public class GuiFarmer extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.farmer); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.farmer); } @Override 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 96fb5c918..496b60997 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 @@ -48,7 +48,7 @@ public class GuiFeeder extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFeeder); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileFeeder); } @Override 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 d3f241c35..9b1372f98 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 @@ -51,7 +51,7 @@ public class GuiFermentingBarrel extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.press); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java index 391def2cf..3d046e213 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java @@ -33,7 +33,7 @@ public class GuiFilter extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".filter.name")); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, StringUtil.localize("container."+ModUtil.MOD_ID+".filter.name")); } @Override 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 45f4f7654..4e70d5fc7 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 @@ -49,7 +49,7 @@ public class GuiFluidCollector extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.collector); } @Override 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 c384490a2..d9069e89e 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 @@ -79,7 +79,7 @@ public class GuiFurnaceDouble extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFurnace); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileFurnace); } @Override 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 487fd67d3..d5e22c4a4 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 @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import java.io.IOException; + import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; @@ -24,8 +26,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.io.IOException; - @SideOnly(Side.CLIENT) public class GuiGiantChest extends GuiWtfMojang{ @@ -65,7 +65,7 @@ public class GuiGiantChest extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.chest); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.chest); } @Override 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 5ed8c2554..365133fbd 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 @@ -91,7 +91,7 @@ public class GuiGrinder extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileGrinder); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileGrinder); } @Override 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 da3a8eebf..dff6b4eac 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 @@ -71,17 +71,17 @@ public class GuiInputter extends GuiContainer{ this.rightFilter = new FilterSettingsGui(this.tileInputter.rightFilter, this.guiLeft+157, this.guiTop+6, this.buttonList); } - this.fieldPullStart = new GuiTextField(3000, this.fontRendererObj, this.guiLeft+6, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPullStart = new GuiTextField(3000, this.fontRenderer, this.guiLeft+6, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); this.fieldPullStart.setMaxStringLength(5); this.fieldPullStart.setEnableBackgroundDrawing(false); - this.fieldPullEnd = new GuiTextField(3001, this.fontRendererObj, this.guiLeft+50, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPullEnd = new GuiTextField(3001, this.fontRenderer, this.guiLeft+50, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); this.fieldPullEnd.setMaxStringLength(5); this.fieldPullEnd.setEnableBackgroundDrawing(false); - this.fieldPutStart = new GuiTextField(3002, this.fontRendererObj, this.guiLeft+91, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPutStart = new GuiTextField(3002, this.fontRenderer, this.guiLeft+91, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); this.fieldPutStart.setMaxStringLength(5); this.fieldPutStart.setEnableBackgroundDrawing(false); - this.fieldPutEnd = new GuiTextField(3004, this.fontRendererObj, this.guiLeft+135, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPutEnd = new GuiTextField(3004, this.fontRenderer, this.guiLeft+135, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); this.fieldPutEnd.setMaxStringLength(5); this.fieldPutEnd.setEnableBackgroundDrawing(false); @@ -106,16 +106,16 @@ public class GuiInputter extends GuiContainer{ int newTopOffset = this.guiTop+(this.isAdvanced ? OFFSET_ADVANCED : 0); //Info Mode on! if(x >= this.guiLeft+4 && y >= newTopOffset+65 && x <= this.guiLeft+4+38 && y <= newTopOffset+65+12){ - this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); + this.drawHoveringText(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); } if(x >= this.guiLeft+89 && y >= newTopOffset+65 && x <= this.guiLeft+89+38 && y <= newTopOffset+65+12){ - this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); + this.drawHoveringText(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); } if(x >= this.guiLeft+48 && y >= newTopOffset+65 && x <= this.guiLeft+48+38 && y <= newTopOffset+65+12){ - this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); + this.drawHoveringText(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); } if(x >= this.guiLeft+133 && y >= newTopOffset+65 && x <= this.guiLeft+133+38 && y <= newTopOffset+65+12){ - this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); + this.drawHoveringText(this.fontRenderer.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); } if(this.isAdvanced){ @@ -126,7 +126,7 @@ public class GuiInputter extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileInputter); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileInputter); } @Override @@ -139,16 +139,16 @@ public class GuiInputter extends GuiContainer{ this.mc.getTextureManager().bindTexture(this.isAdvanced ? RES_LOC_ADVANCED : RES_LOC); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 97+(this.isAdvanced ? OFFSET_ADVANCED : 0)); - this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.inbound"), this.guiLeft+23+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.outbound"), this.guiLeft+104+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.inbound"), this.guiLeft+23+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.outbound"), this.guiLeft+104+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(SIDES[this.tileInputter.sideToPull+1], this.guiLeft+24+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(SIDES[this.tileInputter.sideToPut+1], this.guiLeft+109+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(SIDES[this.tileInputter.sideToPull+1], this.guiLeft+24+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(SIDES[this.tileInputter.sideToPut+1], this.guiLeft+109+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutStart), this.guiLeft+92, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutEnd), this.guiLeft+136, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullStart), this.guiLeft+7, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullEnd), this.guiLeft+51, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRenderer.drawString(Integer.toString(this.tileInputter.slotToPutStart), this.guiLeft+92, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRenderer.drawString(Integer.toString(this.tileInputter.slotToPutEnd), this.guiLeft+136, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRenderer.drawString(Integer.toString(this.tileInputter.slotToPullStart), this.guiLeft+7, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRenderer.drawString(Integer.toString(this.tileInputter.slotToPullEnd), this.guiLeft+51, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); this.fieldPutStart.drawTextBox(); this.fieldPutEnd.drawTextBox(); @@ -257,16 +257,16 @@ public class GuiInputter extends GuiContainer{ } @Override - public void func_191745_a(Minecraft mc, int x, int y, float f){ + public void drawButton(Minecraft mc, int x, int y, float f){ if(this.visible){ mc.getTextureManager().bindTexture(this.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; + this.hovered = x >= this.x && y >= this.y && x < this.x+this.width && y < this.y+this.height; int k = this.getHoverState(this.hovered); GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.xPosition, this.yPosition, this.smaller ? 200 : 176, k*this.height, this.width, this.height); + this.drawTexturedModalRect(this.x, this.y, this.smaller ? 200 : 176, k*this.height, this.width, this.height); this.mouseDragged(mc, x, y); int color = 14737632; @@ -280,7 +280,7 @@ public class GuiInputter extends GuiContainer{ color = 16777120; } - this.drawCenteredString(mc.fontRendererObj, this.displayString, this.xPosition+this.width/2, this.yPosition+(this.height-8)/2, color); + this.drawCenteredString(mc.fontRenderer, this.displayString, this.x+this.width/2, this.y+(this.height-8)/2, color); } } } @@ -295,16 +295,16 @@ public class GuiInputter extends GuiContainer{ } @Override - public void func_191745_a(Minecraft mc, int x, int y, float f){ + public void drawButton(Minecraft mc, int x, int y, float f){ if(this.visible){ mc.getTextureManager().bindTexture(this.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; + this.hovered = x >= this.x && y >= this.y && x < this.x+this.width && y < this.y+this.height; int k = this.getHoverState(this.hovered); GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.xPosition, this.yPosition, 192, k*8, 8, 8); + this.drawTexturedModalRect(this.x, this.y, 192, k*8, 8, 8); this.mouseDragged(mc, x, y); } } 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 843ec3f85..3a2d03074 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 @@ -81,7 +81,7 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang{ if(this.buttonSmartWhitelistLeft.isMouseOver() || this.buttonSmartWhitelistRight.isMouseOver()){ List list = new ArrayList(); list.add(TextFormatting.BOLD+StringUtil.localize("info."+ModUtil.MOD_ID+".gui.smart")); - list.addAll(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.smartInfo"), 200)); + list.addAll(this.fontRenderer.listFormattedStringToWidth(StringUtil.localize("info."+ModUtil.MOD_ID+".gui.smartInfo"), 200)); this.drawHoveringText(list, x, y); } @@ -91,12 +91,12 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tile); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tile); String s1 = StringUtil.localize("info."+ModUtil.MOD_ID+".gui.inbound"); String s2 = StringUtil.localize("info."+ModUtil.MOD_ID+".gui.outbound"); - this.fontRendererObj.drawString(s1, 46-this.fontRendererObj.getStringWidth(s1)/2, 80, StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(s2, 131-this.fontRendererObj.getStringWidth(s2)/2, 80, StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(s1, 46-this.fontRenderer.getStringWidth(s1)/2, 80, StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(s2, 131-this.fontRenderer.getStringWidth(s2)/2, 80, StringUtil.DECIMAL_COLOR_GRAY_TEXT); } @Override 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 a3b68f07e..a0a55046e 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 @@ -49,7 +49,7 @@ public class GuiMiner extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.miner); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.miner); } @Override @@ -63,7 +63,7 @@ public class GuiMiner extends GuiWtfMojang{ this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); String mining = this.miner.onlyMineOres ? "Only Mining Ores" : "Mining Everything"; - this.fontRendererObj.drawString(mining, this.guiLeft+this.xSize/2-this.fontRendererObj.getStringWidth(mining)/2, this.guiTop+8, StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRenderer.drawString(mining, this.guiLeft+this.xSize/2-this.fontRenderer.getStringWidth(mining)/2, this.guiTop+8, StringUtil.DECIMAL_COLOR_GRAY_TEXT); } @Override 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 9a168ff69..5f0fa4210 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 @@ -52,7 +52,7 @@ public class GuiOilGenerator extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.generator); } @Override @@ -71,8 +71,8 @@ public class GuiOilGenerator extends GuiWtfMojang{ } if(this.generator.maxBurnTime > 0 && this.generator.currentEnergyProduce > 0){ - this.drawCenteredString(this.fontRendererObj, this.generator.currentEnergyProduce+" CF/t", this.guiLeft+87, this.guiTop+65, 0xFFFFFF); - this.drawCenteredString(this.fontRendererObj, "for "+this.generator.maxBurnTime+" t", this.guiLeft+87, this.guiTop+75, 0xFFFFFF); + this.drawCenteredString(this.fontRenderer, this.generator.currentEnergyProduce+" CF/t", this.guiLeft+87, this.guiTop+65, 0xFFFFFF); + this.drawCenteredString(this.fontRenderer, "for "+this.generator.maxBurnTime+" t", this.guiLeft+87, this.guiTop+75, 0xFFFFFF); } this.energy.draw(); 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 9d50d14db..8151d557d 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 @@ -69,7 +69,7 @@ public class GuiPhantomPlacer extends GuiWtfMojang{ List textList = new ArrayList(); textList.add(TextFormatting.GOLD+StringUtil.localize(loc+".1")); - textList.addAll(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localize(loc+".2"), 200)); + textList.addAll(this.fontRenderer.listFormattedStringToWidth(StringUtil.localize(loc+".2"), 200)); this.drawHoveringText(textList, mouseX, mouseY); } } @@ -87,7 +87,7 @@ public class GuiPhantomPlacer extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.placer); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.placer); } @Override 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 974f2032b..cc4793340 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 @@ -60,7 +60,7 @@ public class GuiRangedCollector extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.collector); } @Override 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 c175e242f..24b03bf6b 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 @@ -48,7 +48,7 @@ public class GuiRepairer extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileRepairer); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileRepairer); } @Override 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 4c4ed4458..6ef2f5458 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 @@ -58,7 +58,7 @@ public class GuiSmileyCloud extends GuiWtfMojang{ public void initGui(){ super.initGui(); - this.nameField = new GuiTextField(4000, this.fontRendererObj, this.guiLeft+5, this.guiTop+6, 114, 8); + this.nameField = new GuiTextField(4000, this.fontRenderer, this.guiLeft+5, this.guiTop+6, 114, 8); this.nameField.setMaxStringLength(20); this.nameField.setEnableBackgroundDrawing(false); this.nameField.setFocused(true); @@ -68,7 +68,7 @@ public class GuiSmileyCloud extends GuiWtfMojang{ 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")+" "; String localizedName = name+StringUtil.localize("container."+ModUtil.MOD_ID+".cloud.name"); - this.fontRendererObj.drawString(localizedName, this.xSize/2-this.fontRendererObj.getStringWidth(localizedName)/2, -10, StringUtil.DECIMAL_COLOR_WHITE); + this.fontRenderer.drawString(localizedName, this.xSize/2-this.fontRenderer.getStringWidth(localizedName)/2, -10, StringUtil.DECIMAL_COLOR_WHITE); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java index 268700202..77f4e7db9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java @@ -23,6 +23,6 @@ public abstract class GuiWtfMojang extends GuiContainer{ public void drawScreen(int mouseX, int mouseY, float partialTicks){ this.drawDefaultBackground(); super.drawScreen(mouseX, mouseY, partialTicks); - this.func_191948_b(mouseX, mouseY); + this.renderHoveredToolTip(mouseX, mouseY); } } 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 194ccfdfc..742e6c329 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 @@ -64,7 +64,7 @@ public class GuiXPSolidifier extends GuiWtfMojang{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.solidifier); + AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.solidifier); } @Override @@ -77,7 +77,7 @@ public class GuiXPSolidifier extends GuiWtfMojang{ this.mc.getTextureManager().bindTexture(RES_LOC); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); - this.drawCenteredString(this.fontRendererObj, Integer.toString(this.solidifier.amount), this.guiLeft+88, this.guiTop+30, StringUtil.DECIMAL_COLOR_WHITE); + this.drawCenteredString(this.fontRenderer, Integer.toString(this.solidifier.amount), this.guiLeft+88, this.guiTop+30, StringUtil.DECIMAL_COLOR_WHITE); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java index 6b27045b7..21038e947 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; @@ -18,9 +21,6 @@ import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.List; - @SideOnly(Side.CLIENT) public class TexturedButton extends GuiButton{ @@ -42,11 +42,11 @@ public class TexturedButton extends GuiButton{ } @Override - public void func_191745_a(Minecraft minecraft, int x, int y, float f){ + public void drawButton(Minecraft minecraft, int x, int y, float f){ if(this.visible){ minecraft.getTextureManager().bindTexture(this.resLoc); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition+this.width && y < this.yPosition+this.height; + this.hovered = x >= this.x && y >= this.y && x < this.x+this.width && y < this.y+this.height; int k = this.getHoverState(this.hovered); if(k == 0){ k = 1; @@ -55,7 +55,7 @@ public class TexturedButton extends GuiButton{ GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.xPosition, this.yPosition, this.texturePosX, this.texturePosY-this.height+k*this.height, this.width, this.height); + this.drawTexturedModalRect(this.x, this.y, this.texturePosX, this.texturePosY-this.height+k*this.height, this.width, this.height); this.mouseDragged(minecraft, x, y); } } @@ -63,7 +63,7 @@ public class TexturedButton extends GuiButton{ public void drawHover(int x, int y){ if(this.isMouseOver()){ Minecraft mc = Minecraft.getMinecraft(); - GuiUtils.drawHoveringText(this.textList, x, y, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); + GuiUtils.drawHoveringText(this.textList, x, y, mc.displayWidth, mc.displayHeight, -1, mc.fontRenderer); } } } 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 ad692a32d..78aad6655 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java @@ -10,7 +10,11 @@ package de.ellpeck.actuallyadditions.mod.items; +import java.util.Collections; +import java.util.Set; + import com.google.common.collect.Sets; + import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,9 +24,6 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import java.util.Collections; -import java.util.Set; - public class ItemAxeAA extends ItemToolAA{ private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.PLANKS, Blocks.BOOKSHELF, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE); 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 9c9d9b44a..fd24439ca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.items; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; @@ -30,8 +32,6 @@ import net.minecraft.world.World; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import java.util.List; - public class ItemBattery extends ItemEnergy{ public ItemBattery(String name, int capacity, int transfer){ 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 4991aa95e..a55e981f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -116,18 +116,18 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ String strg3 = StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.hudDisplay.open"); AssetUtil.renderStackToGui(StackUtil.isValid(page.getChapter().getDisplayItemStack()) ? page.getChapter().getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2-10, height+41, 1F); - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg1, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg1)/2, height+20, StringUtil.DECIMAL_COLOR_WHITE); - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg2, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg2)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE); - minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+strg3, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg1, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg1)/2, height+20, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg2, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg2)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(TextFormatting.GOLD+strg3, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE); } else{ String strg1 = TextFormatting.DARK_RED+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.hudDisplay.noInfo"); String strg2 = TextFormatting.DARK_GREEN+""+TextFormatting.ITALIC+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.hudDisplay.noInfo.desc.1"); String strg3 = TextFormatting.DARK_GREEN+""+TextFormatting.ITALIC+StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.hudDisplay.noInfo.desc.2"); - minecraft.fontRendererObj.drawStringWithShadow(strg1, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg1)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE); - minecraft.fontRendererObj.drawStringWithShadow(strg2, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg2)/2, height+50, StringUtil.DECIMAL_COLOR_WHITE); - minecraft.fontRendererObj.drawStringWithShadow(strg3, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(strg1, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg1)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(strg2, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg2)/2, height+50, StringUtil.DECIMAL_COLOR_WHITE); + minecraft.fontRenderer.drawStringWithShadow(strg3, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE); } } } 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 51fac320a..b0cfa44c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -10,6 +10,11 @@ package de.ellpeck.actuallyadditions.mod.items; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nullable; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; @@ -31,10 +36,6 @@ import net.minecraft.util.StringUtils; import net.minecraft.world.World; import net.minecraftforge.fml.common.Loader; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - public class ItemCoffee extends ItemFoodBase{ public ItemCoffee(String name){ 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 00861c0a3..e8616ae35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -57,7 +57,7 @@ public class ItemCrystal extends ItemBase{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < BlockCrystal.ALL_CRYSTALS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java index 70aca9504..8ccf6fe56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java @@ -50,7 +50,7 @@ public class ItemCrystalShard extends ItemBase implements IColorProvidingItem{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < BlockCrystal.ALL_CRYSTALS.length; j++){ list.add(new ItemStack(this, 1, j)); } 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 d2aa67eea..09d53af40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -329,7 +329,7 @@ public class ItemDrill extends ItemEnergy{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tabs, NonNullList list){ - if(this.func_194125_a(tabs)){ + if(this.isInCreativeTab(tabs)){ for(int i = 0; i < 16; i++){ this.addDrillStack(list, i); } 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 35c6e58f1..373ea8358 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -52,7 +52,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < ALL_DUSTS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java index cecaf2fdc..efb30ad33 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.items; +import java.util.List; +import java.util.Set; + import de.ellpeck.actuallyadditions.api.misc.IGoggles; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA; @@ -27,9 +30,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; -import java.util.Set; - public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles{ private final Set cachedGlowingEntities = new ConcurrentSet(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java index cd35cf9a9..31c813a37 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.items; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; @@ -25,8 +27,6 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import java.util.List; - public class ItemFilter extends ItemBase{ public ItemFilter(String name){ 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 3588454ef..d3a2a4cdf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -95,7 +95,7 @@ public class ItemFoods extends ItemFoodBase{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < ALL_FOODS.length; j++){ list.add(new ItemStack(this, 1, j)); } 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 a19398993..7c017a6ae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -61,7 +61,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < ALL_JAMS.length; j++){ list.add(new ItemStack(this, 1, j)); } 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 fb426bc33..c0d91ebe0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.items; import com.google.common.collect.Multimap; + import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.SharedMonsterAttributes; 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 8286819ab..9cee54180 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -49,15 +49,15 @@ public class ItemMagnetRing extends ItemEnergy{ if(!items.isEmpty()){ for(EntityItem item : items){ if(!item.isDead && !item.cannotPickup()){ - int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem()); + int energyForItem = 50*StackUtil.getStackSize(item.getItem()); if(this.getEnergyStored(stack) >= energyForItem){ - ItemStack oldItem = StackUtil.validateCopy(item.getEntityItem()); + ItemStack oldItem = StackUtil.validateCopy(item.getItem()); item.onCollideWithPlayer(player); if(!player.capabilities.isCreativeMode){ - if(item.isDead || !ItemStack.areItemStacksEqual(item.getEntityItem(), oldItem)){ + if(item.isDead || !ItemStack.areItemStacksEqual(item.getItem(), oldItem)){ this.extractEnergyInternal(stack, energyForItem, false); } } 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 cda26e9ab..d48957633 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -57,7 +57,7 @@ public class ItemMisc extends ItemBase{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < ALL_MISC_ITEMS.length; j++){ if(j != TheMiscItems.YOUTUBE_ICON.ordinal()){ list.add(new ItemStack(this, 1, j)); @@ -77,7 +77,7 @@ public class ItemMisc extends ItemBase{ @Override public boolean onEntityItemUpdate(EntityItem entity){ if(!entity.world.isRemote){ - ItemStack stack = entity.getEntityItem(); + ItemStack stack = entity.getItem(); if(stack != null){ boolean isEmpowered = stack.getItemDamage() == TheMiscItems.EMPOWERED_CANOLA_SEED.ordinal(); if(stack.getItemDamage() == TheMiscItems.CRYSTALLIZED_CANOLA_SEED.ordinal() || isEmpowered){ 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 4d50849e8..b6ccbbc3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -146,7 +146,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem, IDi @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list){ - if(this.func_194125_a(tab)){ + if(this.isInCreativeTab(tab)){ for(int j = 0; j < ALL_RINGS.length; j++){ list.add(new ItemStack(this, 1, j)); 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 64e5c66e5..012bc8837 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -41,7 +41,7 @@ public class ItemSolidifiedExperience extends ItemBase{ @SubscribeEvent public void onEntityDropEvent(LivingDropsEvent event){ if(ConfigBoolValues.DO_XP_DROPS.isEnabled()){ - if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getEntity() instanceof EntityPlayer){ + if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer){ //Drop Solidified XP if(event.getEntityLiving() instanceof EntityCreature){ if(event.getEntityLiving().world.rand.nextInt(10) <= event.getLootingLevel()*2){ 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 714d4ba7d..460d6663a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -39,9 +39,9 @@ public class ItemTeleStaff extends ItemEnergy{ if(pos != null && (pos.typeOfHit == RayTraceResult.Type.BLOCK || player.rotationPitch >= -5)){ int side = pos.sideHit.ordinal(); if(side != -1){ - double x = pos.hitVec.xCoord-(side == 4 ? 0.5 : 0)+(side == 5 ? 0.5 : 0); - double y = pos.hitVec.yCoord-(side == 0 ? 2.0 : 0)+(side == 1 ? 0.5 : 0); - double z = pos.hitVec.zCoord-(side == 2 ? 0.5 : 0)+(side == 3 ? 0.5 : 0); + double x = pos.hitVec.x-(side == 4 ? 0.5 : 0)+(side == 5 ? 0.5 : 0); + double y = pos.hitVec.y-(side == 0 ? 2.0 : 0)+(side == 1 ? 0.5 : 0); + double z = pos.hitVec.z-(side == 2 ? 0.5 : 0)+(side == 3 ? 0.5 : 0); 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){ 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 96ec6f37d..15b6a1e3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -93,7 +93,7 @@ public class ItemWingsOfTheBats extends ItemBase{ @SubscribeEvent public void onEntityDropEvent(LivingDropsEvent event){ - Entity source = event.getSource().getEntity(); + Entity source = event.getSource().getTrueSource(); if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && source instanceof EntityPlayer){ //Drop Wings from Bats 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 a8322e5f3..295a4047a 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 @@ -74,7 +74,7 @@ public abstract class ItemEnergy extends ItemBase{ @Override @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tabs, NonNullList list){ - if(this.func_194125_a(tabs)){ + if(this.isInCreativeTab(tabs)){ ItemStack stackFull = new ItemStack(this); if(stackFull.hasCapability(CapabilityEnergy.ENERGY, null)){ IEnergyStorage storage = stackFull.getCapability(CapabilityEnergy.ENERGY, null); 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 7eeae101b..bb65b4c72 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 @@ -11,6 +11,10 @@ package de.ellpeck.actuallyadditions.mod.items.lens; +import java.util.ArrayList; +import java.util.Map; +import java.util.Random; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; @@ -26,10 +30,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; -import java.util.Map; -import java.util.Random; - public class LensColor extends Lens{ public static final int ENERGY_USE = 200; @@ -67,8 +67,8 @@ public class LensColor extends Lens{ ArrayList items = (ArrayList)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(hitBlock.getX(), hitBlock.getY(), hitBlock.getZ(), hitBlock.getX()+1, hitBlock.getY()+1, hitBlock.getZ()+1)); for(EntityItem item : items){ - if(!item.isDead && StackUtil.isValid(item.getEntityItem()) && tile.getEnergy() >= ENERGY_USE){ - ItemStack newStack = this.tryConvert(item.getEntityItem(), hitState, hitBlock, tile); + if(!item.isDead && StackUtil.isValid(item.getItem()) && tile.getEnergy() >= ENERGY_USE){ + ItemStack newStack = this.tryConvert(item.getItem(), hitState, hitBlock, tile); if(StackUtil.isValid(newStack)){ item.setDead(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java index 900f9478c..294b3fa08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java @@ -43,7 +43,7 @@ public class LensDisenchanting extends Lens{ EntityItem toDisenchant = null; for(EntityItem item : items){ if(item != null && !item.isDead){ - ItemStack stack = item.getEntityItem(); + ItemStack stack = item.getItem(); if(StackUtil.isValid(stack) && StackUtil.getStackSize(stack) == 1){ Item stackItem = stack.getItem(); if(stackItem == Items.BOOK || stackItem == Items.ENCHANTED_BOOK){ @@ -70,8 +70,8 @@ public class LensDisenchanting extends Lens{ } if(book != null && toDisenchant != null){ - ItemStack disenchantStack = toDisenchant.getEntityItem(); - ItemStack bookStack = book.getEntityItem(); + ItemStack disenchantStack = toDisenchant.getItem(); + ItemStack bookStack = book.getItem(); Map enchants = EnchantmentHelper.getEnchantments(disenchantStack); if(enchants != null && !enchants.isEmpty()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java index bcdf7a038..8d4cc151a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.items.lens; +import java.util.ArrayList; + import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -24,8 +26,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; - public class LensDisruption extends Lens{ private static final int ENERGY_USE = 150000; @@ -36,7 +36,7 @@ public class LensDisruption extends Lens{ int range = 2; ArrayList items = (ArrayList)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(hitBlock.getX()-range, hitBlock.getY()-range, hitBlock.getZ()-range, hitBlock.getX()+range, hitBlock.getY()+range, hitBlock.getZ()+range)); for(EntityItem item : items){ - ItemStack stack = item.getEntityItem(); + ItemStack stack = item.getItem(); if(!item.isDead && StackUtil.isValid(stack)){ if(!stack.hasTagCompound() || !stack.getTagCompound().getBoolean(ModUtil.MOD_ID+"DisruptedAlready")){ 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 74494c50f..fed63bdd1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java @@ -53,7 +53,7 @@ public abstract class RecipeWrapperWithButton extends BlankRecipeWrapper{ @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ - this.theButton.func_191745_a(minecraft, mouseX, mouseY, 0F); + this.theButton.drawButton(minecraft, mouseX, mouseY, 0F); } @Nullable 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 6c72f3d06..73d55ad64 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 @@ -47,20 +47,20 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton{ @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ - List header = minecraft.fontRendererObj.listFormattedStringToWidth(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".booklet.header").replaceAll("", TextFormatting.BLUE+"").replaceAll("", TextFormatting.BLACK+""), 150); + List header = minecraft.fontRenderer.listFormattedStringToWidth(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".booklet.header").replaceAll("", TextFormatting.BLUE+"").replaceAll("", TextFormatting.BLACK+""), 150); for(int i = 0; i < header.size(); i++){ - minecraft.fontRendererObj.drawString((String)header.get(i), 0, 17+i*(minecraft.fontRendererObj.FONT_HEIGHT+1), 0, false); + minecraft.fontRenderer.drawString((String)header.get(i), 0, 17+i*(minecraft.fontRenderer.FONT_HEIGHT+1), 0, false); } int maxLines = 4; IBookletChapter chapter = this.thePage.getChapter(); String aText = chapter.getAllPages()[0].getInfoText(); - List text = minecraft.fontRendererObj.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED+StringUtil.localize("container.nei."+ModUtil.MOD_ID+".booklet.noText"), 150); + List text = minecraft.fontRenderer.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED+StringUtil.localize("container.nei."+ModUtil.MOD_ID+".booklet.noText"), 150); for(int i = 0; i < Math.min(maxLines, text.size()); i++){ - minecraft.fontRendererObj.drawString(text.get(i)+(i == maxLines-1 && text.size() > maxLines ? TextFormatting.RESET+""+TextFormatting.BLACK+"..." : ""), 0, 16+25+i*(minecraft.fontRendererObj.FONT_HEIGHT+1), 0, false); + minecraft.fontRenderer.drawString(text.get(i)+(i == maxLines-1 && text.size() > maxLines ? TextFormatting.RESET+""+TextFormatting.BLACK+"..." : ""), 0, 16+25+i*(minecraft.fontRenderer.FONT_HEIGHT+1), 0, false); } - minecraft.fontRendererObj.drawString(TextFormatting.ITALIC+chapter.getLocalizedName(), 25, 85, 0, false); - minecraft.fontRendererObj.drawString(TextFormatting.ITALIC+"Page "+(chapter.getPageIndex(this.thePage)+1), 25, 95, 0, false); + minecraft.fontRenderer.drawString(TextFormatting.ITALIC+chapter.getLocalizedName(), 25, 85, 0, false); + minecraft.fontRenderer.drawString(TextFormatting.ITALIC+"Page "+(chapter.getPageIndex(this.thePage)+1), 25, 95, 0, false); super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); } 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 bb0f3bfa5..4c8b3c9b5 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 @@ -55,12 +55,12 @@ public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton{ @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ if(this.theIngredient.getExtraText() != null){ - minecraft.fontRendererObj.drawString(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".coffee.special")+":", 2, 4, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); - minecraft.fontRendererObj.drawString(this.theIngredient.getExtraText(), 2, 16, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); + minecraft.fontRenderer.drawString(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".coffee.special")+":", 2, 4, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); + minecraft.fontRenderer.drawString(this.theIngredient.getExtraText(), 2, 16, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); } if(this.theIngredient.maxAmplifier > 0){ - minecraft.fontRendererObj.drawString(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".coffee.maxAmount")+": "+this.theIngredient.maxAmplifier, 2, 28, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); + minecraft.fontRenderer.drawString(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".coffee.maxAmount")+": "+this.theIngredient.maxAmplifier, 2, 28, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); } super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); 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 d61a9f42a..b9d411137 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 @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.jei.crusher; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; @@ -21,9 +24,6 @@ import mezz.jei.api.ingredients.IIngredients; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.List; - public class CrusherRecipeWrapper extends RecipeWrapperWithButton{ public final CrusherRecipe theRecipe; @@ -47,7 +47,7 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton{ @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ if(StackUtil.isValid(this.theRecipe.outputTwoStack)){ - minecraft.fontRendererObj.drawString(this.theRecipe.outputTwoChance+"%", 60, 60, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); + minecraft.fontRenderer.drawString(this.theRecipe.outputTwoChance+"%", 60, 60, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); } super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); 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 fbc27f3b4..1497843d8 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 @@ -35,7 +35,7 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton{ @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ - minecraft.fontRendererObj.drawString(this.theRecipe.energyUse+" CF", 55, 0, 0xFFFFFF, true); + minecraft.fontRenderer.drawString(this.theRecipe.energyUse+" CF", 55, 0, 0xFFFFFF, true); super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java index d3f463b52..7ebf2db74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java @@ -21,7 +21,11 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.*; +import net.minecraft.world.storage.loot.LootEntry; +import net.minecraft.world.storage.loot.LootEntryItem; +import net.minecraft.world.storage.loot.LootPool; +import net.minecraft.world.storage.loot.LootTableList; +import net.minecraft.world.storage.loot.RandomValueRange; import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraft.world.storage.loot.functions.LootFunction; import net.minecraft.world.storage.loot.functions.SetCount; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java index c48c746d0..018819470 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.misc.apiimpl; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; @@ -44,9 +47,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; -import java.util.List; - public class MethodHandler implements IMethodHandler{ @Override @@ -194,7 +194,7 @@ public class MethodHandler implements IMethodHandler{ //Converting the Items ArrayList items = (ArrayList)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(hitBlock.getX()-rangeX, hitBlock.getY()-rangeY, hitBlock.getZ()-rangeZ, hitBlock.getX()+1+rangeX, hitBlock.getY()+1+rangeY, hitBlock.getZ()+1+rangeZ)); for(EntityItem item : items){ - ItemStack stack = item.getEntityItem(); + ItemStack stack = item.getItem(); if(!item.isDead && StackUtil.isValid(stack)){ List recipes = LensRecipeHandler.getRecipesFor(stack); for(LensConversionRecipe recipe : recipes){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java index d6b08ffe4..d4f3ceab1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +import java.util.List; + import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; @@ -23,8 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public class MelonPumpkinFarmerBehavior implements IFarmerBehavior{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java index 2316e7501..380f60c4b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java @@ -37,7 +37,7 @@ public class RenderSpecial{ Vec3d currentPos = Minecraft.getMinecraft().player.getPositionEyes(partialTicks); Vec3d playerPos = player.getPositionEyes(partialTicks); - GlStateManager.translate(playerPos.xCoord-currentPos.xCoord, playerPos.yCoord-currentPos.yCoord, playerPos.zCoord-currentPos.zCoord); + GlStateManager.translate(playerPos.x-currentPos.x, playerPos.y-currentPos.y, playerPos.z-currentPos.z); GlStateManager.translate(0D, 2.575D-(player.isSneaking() ? 0.125D : 0D), 0D); this.render(); 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 184318967..f9e54ff21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -11,14 +11,32 @@ package de.ellpeck.actuallyadditions.mod.proxy; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.ClientRegistryHandler; -import de.ellpeck.actuallyadditions.mod.blocks.render.*; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderBatteryBox; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderCompost; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderDisplayStand; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderEmpowerer; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderLaserRelay; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderReconstructorLens; +import de.ellpeck.actuallyadditions.mod.blocks.render.RenderSmileyCloud; import de.ellpeck.actuallyadditions.mod.entity.InitEntities; import de.ellpeck.actuallyadditions.mod.event.ClientEvents; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.mod.tile.*; -import de.ellpeck.actuallyadditions.mod.util.FluidStateMapper; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyAdvanced; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyExtreme; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayFluids; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItem; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; import de.ellpeck.actuallyadditions.mod.util.IColorProvidingBlock; import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -30,17 +48,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import java.util.ArrayList; -import java.util.List; - public class ClientProxy implements IProxy{ private static final List COLOR_PRODIVIDING_ITEMS_FOR_REGISTERING = new ArrayList(); 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 b70afd359..f16831914 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.recipe; +import java.util.ArrayList; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; @@ -20,8 +22,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; - public final class CrusherRecipeRegistry{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java index d5dc2e1ac..7bc3f51f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.tile; +import org.apache.commons.lang3.ArrayUtils; + import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; import de.ellpeck.actuallyadditions.mod.items.ItemDrill; @@ -20,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.ArrayUtils; public class FilterSettings{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java index 38c93a95e..d584f347f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.ArrayList; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.items.ItemBattery; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; @@ -19,9 +22,6 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import java.util.ArrayList; -import java.util.List; - public class TileEntityBatteryBox extends TileEntityInventoryBase implements ISharingEnergyProvider{ private int lastEnergyStored; 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 63428305f..a5ec262d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -21,8 +23,6 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class TileEntityDirectionalBreaker extends TileEntityInventoryBase{ public static final int RANGE = 8; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index 17606f5b7..f4f36bf6b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -10,6 +10,10 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; @@ -22,10 +26,6 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class TileEntityEmpowerer extends TileEntityInventoryBase{ public int processTime; 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 f267c72c5..cbe657065 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityHorse; @@ -22,8 +24,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class TileEntityFeeder extends TileEntityInventoryBase{ public static final int THRESHOLD = 30; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java index 5a061ab3b..b18b22db1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; @@ -23,8 +25,6 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import java.util.List; - public class TileEntityFishingNet extends TileEntityBase{ public int timeUntilNextDrop; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java index 72bc7383e..fcc6fe4e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java @@ -55,8 +55,8 @@ public class TileEntityItemViewerHopping extends TileEntityItemViewer{ if(ActuallyAdditions.commonCapsLoaded){ Object slotless = this.itemHandler.getSlotlessHandler(); if(slotless instanceof ISlotlessItemHandler){ - ItemStack left = ((ISlotlessItemHandler)slotless).insertItem(item.getEntityItem(), false); - item.setEntityItemStack(left); + ItemStack left = ((ISlotlessItemHandler)slotless).insertItem(item.getItem(), false); + item.setItem(left); if(!StackUtil.isValid(left)){ item.setDead(); @@ -68,8 +68,8 @@ public class TileEntityItemViewerHopping extends TileEntityItemViewer{ IItemHandler handler = this.itemHandler.getNormalHandler(); if(handler != null){ for(int i = 0; i < handler.getSlots(); i++){ - ItemStack left = handler.insertItem(i, item.getEntityItem(), false); - item.setEntityItemStack(left); + ItemStack left = handler.insertItem(i, item.getItem(), false); + item.setItem(left); if(!StackUtil.isValid(left)){ item.setDead(); 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 e92aa8047..1de197982 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.ArrayList; + import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; @@ -25,8 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; - public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements IPhantomTile, IButtonReactor{ public static final int RANGE = 3; @@ -52,9 +52,9 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements if(type != NBTType.SAVE_BLOCK){ compound.setInteger("Range", this.range); if(this.boundPosition != null){ - compound.setInteger("XCoordOfTileStored", this.boundPosition.getX()); - compound.setInteger("YCoordOfTileStored", this.boundPosition.getY()); - compound.setInteger("ZCoordOfTileStored", this.boundPosition.getZ()); + compound.setInteger("xOfTileStored", this.boundPosition.getX()); + compound.setInteger("yOfTileStored", this.boundPosition.getY()); + compound.setInteger("zOfTileStored", this.boundPosition.getZ()); } if(!this.isBreaker){ compound.setInteger("Side", this.side); @@ -66,9 +66,9 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements public void readSyncableNBT(NBTTagCompound compound, NBTType type){ super.readSyncableNBT(compound, type); if(type != NBTType.SAVE_BLOCK){ - int x = compound.getInteger("XCoordOfTileStored"); - int y = compound.getInteger("YCoordOfTileStored"); - int z = compound.getInteger("ZCoordOfTileStored"); + int x = compound.getInteger("xOfTileStored"); + int y = compound.getInteger("yOfTileStored"); + int z = compound.getInteger("zOfTileStored"); this.range = compound.getInteger("Range"); if(!(x == 0 && y == 0 && z == 0)){ this.boundPosition = new BlockPos(x, y, z); 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 b658c1a90..c201b145c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -60,9 +60,9 @@ public abstract class TileEntityPhantomface extends TileEntityInventoryBase impl if(type != NBTType.SAVE_BLOCK){ compound.setInteger("Range", this.range); if(this.boundPosition != null){ - compound.setInteger("XCoordOfTileStored", this.boundPosition.getX()); - compound.setInteger("YCoordOfTileStored", this.boundPosition.getY()); - compound.setInteger("ZCoordOfTileStored", this.boundPosition.getZ()); + compound.setInteger("xOfTileStored", this.boundPosition.getX()); + compound.setInteger("yOfTileStored", this.boundPosition.getY()); + compound.setInteger("zOfTileStored", this.boundPosition.getZ()); } } } @@ -71,9 +71,9 @@ public abstract class TileEntityPhantomface extends TileEntityInventoryBase impl public void readSyncableNBT(NBTTagCompound compound, NBTType type){ super.readSyncableNBT(compound, type); if(type != NBTType.SAVE_BLOCK){ - int x = compound.getInteger("XCoordOfTileStored"); - int y = compound.getInteger("YCoordOfTileStored"); - int z = compound.getInteger("ZCoordOfTileStored"); + int x = compound.getInteger("xOfTileStored"); + int y = compound.getInteger("yOfTileStored"); + int z = compound.getInteger("zOfTileStored"); this.range = compound.getInteger("Range"); if(!(x == 0 && y == 0 && z == 0)){ this.boundPosition = new BlockPos(x, y, z); 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 338889ad7..903e313f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java @@ -56,8 +56,8 @@ public class TileEntityRangedCollector extends TileEntityInventoryBase implement ArrayList items = (ArrayList)this.world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(this.pos.getX()-RANGE, this.pos.getY()-RANGE, this.pos.getZ()-RANGE, this.pos.getX()+RANGE, this.pos.getY()+RANGE, this.pos.getZ()+RANGE)); if(!items.isEmpty()){ for(EntityItem item : items){ - if(!item.isDead && !item.cannotPickup() && StackUtil.isValid(item.getEntityItem())){ - ItemStack toAdd = item.getEntityItem().copy(); + if(!item.isDead && !item.cannotPickup() && StackUtil.isValid(item.getItem())){ + ItemStack toAdd = item.getItem().copy(); if(this.filter.check(toAdd)){ ArrayList checkList = new ArrayList(); checkList.add(toAdd); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java index 6c5f5aec2..ec160b171 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java @@ -10,13 +10,13 @@ package de.ellpeck.actuallyadditions.mod.tile; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.IEnergyStorage; -import java.util.ArrayList; -import java.util.List; - public class TileEntityShockSuppressor extends TileEntityBase implements IEnergyDisplay{ public static final List SUPPRESSORS = new ArrayList(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java index 940855c07..d66d7be23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java @@ -10,14 +10,14 @@ package de.ellpeck.actuallyadditions.mod.update; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; - import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; + public class ThreadUpdateChecker extends Thread{ public ThreadUpdateChecker(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index ccd935e3c..15bf8df17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -120,11 +120,11 @@ public final class AssetUtil{ GlStateManager.scale(scale, scale, scale); Minecraft mc = Minecraft.getMinecraft(); - boolean flagBefore = mc.fontRendererObj.getUnicodeFlag(); - mc.fontRendererObj.setUnicodeFlag(false); + boolean flagBefore = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(false); Minecraft.getMinecraft().getRenderItem().renderItemAndEffectIntoGUI(stack, 0, 0); - Minecraft.getMinecraft().getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, stack, 0, 0, null); - mc.fontRendererObj.setUnicodeFlag(flagBefore); + Minecraft.getMinecraft().getRenderItem().renderItemOverlayIntoGUI(mc.fontRenderer, stack, 0, 0, null); + mc.fontRenderer.setUnicodeFlag(flagBefore); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); @@ -162,7 +162,7 @@ public final class AssetUtil{ @SideOnly(Side.CLIENT) public static void renderNameTag(String tag, double x, double y, double z){ - FontRenderer fontrenderer = Minecraft.getMinecraft().fontRendererObj; + FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; float f = 1.6F; float f1 = 0.016666668F*f; GlStateManager.pushMatrix(); @@ -245,8 +245,8 @@ public final class AssetUtil{ Vec3d combinedVec = vec2.subtract(vec1); double rot = rotationTime > 0 ? (360D*((world.getTotalWorldTime()%rotationTime)/rotationTime)) : 0; - double pitch = Math.atan2(combinedVec.yCoord, Math.sqrt(combinedVec.xCoord*combinedVec.xCoord+combinedVec.zCoord*combinedVec.zCoord)); - double yaw = Math.atan2(-combinedVec.zCoord, combinedVec.xCoord); + double pitch = Math.atan2(combinedVec.y, Math.sqrt(combinedVec.x*combinedVec.x+combinedVec.z*combinedVec.z)); + double yaw = Math.atan2(-combinedVec.z, combinedVec.x); double length = combinedVec.lengthVector(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java index 20de137d2..5faf6a4b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java @@ -10,18 +10,19 @@ package de.ellpeck.actuallyadditions.mod.util; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; + import com.google.common.collect.Lists; + import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.items.IItemHandlerModifiable; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - //This is stuff copied from somewhere in vanilla and changed so that it works properly //It's unpolished and vanilla-y, so don't look at it! O_O public final class AwfulUtil{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java index b7a566367..fe22213e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.util; +import java.util.Arrays; +import java.util.List; + import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.RegistryHandler; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; @@ -25,8 +28,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; -import java.util.*; - public final class ItemUtil{ public static Item getItemFromName(String name){ 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 c44002fd5..41dfe687a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -199,7 +199,7 @@ public final class WorldUtil{ /** * Checks if a given Block with a given Meta is present in given Positions * - * @param positions The Positions, an array of {xCoord, yCoord, zCoord} arrays containing Positions + * @param positions The Positions, an array of {x, y, z} arrays containing Positions * @param block The Block * @param meta The Meta * @param world The World diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java index c2eb70536..f9b307012 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java @@ -24,6 +24,7 @@ import net.minecraft.item.crafting.*; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreIngredient; import java.util.*; @@ -42,152 +43,11 @@ public final class RecipeHandler{ } public static void addShapelessRecipe(ItemStack output, Object... inputs){ - String namespace = getNamespace(); - NonNullList ingredients = NonNullList.create(); - - for(Object input : inputs){ - ingredients.add(asIngredient(input)); - } - - if(ingredients.isEmpty()){ - throw new IllegalArgumentException("No ingredients for shapeless recipe"); - } - else if(ingredients.size() > 9){ - throw new IllegalArgumentException("Too many ingredients for shapeless recipe"); - } - - ShapelessRecipes recipe = new ShapelessRecipes(outputGroup(namespace, output), output, ingredients); - addRecipe(unusedLocForOutput(namespace, output), recipe); + RecipeHelper.addOldShapeless(output, inputs); } public static void addShapedRecipe(ItemStack output, Object... inputs){ - String namespace = getNamespace(); - ArrayList pattern = Lists.newArrayList(); - Map key = Maps.newHashMap(); - Iterator itr = Arrays.asList(inputs).iterator(); - - while(itr.hasNext()){ - Object obj = itr.next(); - - if(obj instanceof String){ - String str = (String)obj; - - if(str.length() > 3){ - throw new IllegalArgumentException("Invalid string length for recipe "+str.length()); - } - - if(pattern.size() <= 2){ - pattern.add(str); - } - else{ - throw new IllegalArgumentException("Recipe has too many crafting rows!"); - } - } - else if(obj instanceof Character){ - key.put(((Character)obj).toString(), asIngredient(itr.next())); - } - else{ - throw new IllegalArgumentException("Unexpected argument of type "+obj.getClass().toString()); - } - } - - int width = pattern.get(0).length(); - int height = pattern.size(); - - try{ - key.put(" ", Ingredient.field_193370_a); - Object ingredients = prepareMaterials(pattern.toArray(new String[pattern.size()]), key, width, height); - ShapedRecipes recipe = new ShapedRecipes(outputGroup(namespace, output), width, height, (NonNullList)ingredients, output); - addRecipe(unusedLocForOutput(namespace, output), recipe); - } - catch(Throwable e){ - throw new RuntimeException(e); - } + RecipeHelper.addOldShaped(output, inputs); } - // copy from vanilla - private static NonNullList prepareMaterials(String[] p_192402_0_, Map p_192402_1_, int p_192402_2_, int p_192402_3_){ - NonNullList nonnulllist = NonNullList.withSize(p_192402_2_*p_192402_3_, Ingredient.field_193370_a); - Set set = Sets.newHashSet(p_192402_1_.keySet()); - set.remove(" "); - - for(int i = 0; i < p_192402_0_.length; ++i){ - for(int j = 0; j < p_192402_0_[i].length(); ++j){ - String s = p_192402_0_[i].substring(j, j+1); - Ingredient ingredient = p_192402_1_.get(s); - - set.remove(s); - nonnulllist.set(j+p_192402_2_*i, ingredient); - } - } - - return nonnulllist; - } - - public static void addRecipe(ResourceLocation res, IRecipe recipe){ - if(!(recipe instanceof RecipePotionRingCharging) && !(recipe instanceof RecipeBioMash)){ - if(recipe.getRecipeOutput().isEmpty()){ - throw new IllegalArgumentException("Illegal recipe output"); - } - } - - recipe.setRegistryName(res); - RegistryHandler.RECIPES_TO_REGISTER.add(recipe); - lastRecipe = recipe; - } - - private static Ingredient asIngredient(Object object){ - if(object instanceof Item){ - return Ingredient.func_193367_a((Item)object); - } - - else if(object instanceof Block){ - return Ingredient.func_193369_a(new ItemStack((Block)object)); - } - - else if(object instanceof ItemStack){ - return Ingredient.func_193369_a((ItemStack)object); - } - - else if(object instanceof String){ - return new OreIngredient((String)object); - } - - throw new IllegalArgumentException("Cannot convert object of type "+object.getClass().toString()+" to an Ingredient!"); - } - - private static ResourceLocation unusedLocForOutput(String namespace, ItemStack output){ - ResourceLocation baseLoc = new ResourceLocation(namespace, output.getItem().getRegistryName().getResourcePath()); - ResourceLocation recipeLoc = baseLoc; - int index = 0; - - // find unused recipe name - while(CraftingManager.field_193380_a.containsKey(recipeLoc)){ - index++; - recipeLoc = new ResourceLocation(namespace, baseLoc.getResourcePath()+"_"+index); - } - - return recipeLoc; - } - - private static String outputGroup(String namespace, ItemStack output){ - Item item = output.getItem(); - if(item instanceof IRecipeGrouped){ - return namespace+":"+((IRecipeGrouped)item).getRecipeGroup(); - } - if(item instanceof ItemBlock){ - Block block = ((ItemBlock)item).getBlock(); - if(block instanceof IRecipeGrouped){ - return namespace+":"+((IRecipeGrouped)block).getRecipeGroup(); - } - } - - return output.getItem().getRegistryName().toString(); - } - - private static String getNamespace(){ - return Loader.instance().activeModContainer().getModId(); - } - - } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java new file mode 100644 index 000000000..2960fae71 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java @@ -0,0 +1,233 @@ +package de.ellpeck.actuallyadditions.mod.util.crafting; + +import java.util.List; + +import de.ellpeck.actuallyadditions.mod.RegistryHandler; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.CraftingHelper.ShapedPrimer; +import net.minecraftforge.oredict.OreIngredient; + +//This class created by Shadows_of_Fire +//MIT License +public class RecipeHelper { + + private static int j = 0; + private static final String MODID = ModUtil.MOD_ID; + private static final String MODNAME = ModUtil.NAME; + public static final List recipeList = RegistryHandler.RECIPES_TO_REGISTER; + + /* + * This adds the recipe to the list of crafting recipes. Since who cares about names, it adds it as recipesX, where X is the current recipe you are adding. + */ + public static void addRecipe(int j, IRecipe rec) { + if (rec.getRegistryName() == null) + recipeList.add(rec.setRegistryName(new ResourceLocation(MODID, "recipes" + j))); + else + recipeList.add(rec); + } + + /* + * This adds the recipe to the list of crafting recipes. Cares about names. + */ + public static void addRecipe(String name, IRecipe rec) { + if (rec.getRegistryName() == null) + recipeList.add(rec.setRegistryName(new ResourceLocation(MODID, name))); + else + recipeList.add(rec); + } + + /* + * This adds a shaped recipe to the list of crafting recipes, using the forge format. + */ + public static void addOldShaped(ItemStack output, Object... input) { + ShapedPrimer primer = CraftingHelper.parseShaped(input); + addRecipe(j++, new ShapedRecipes(new ResourceLocation(MODID, "recipes" + j).toString(), primer.width, + primer.height, primer.input, output)); + } + + /* + * This adds a shaped recipe to the list of crafting recipes, using the forge format, with a custom group. + */ + public static void addOldShaped(String group, ItemStack output, Object... input) { + ShapedPrimer primer = CraftingHelper.parseShaped(input); + addRecipe(j++, new ShapedRecipes(new ResourceLocation(MODID, group).toString(), primer.width, primer.height, + primer.input, output)); + } + + /* + * This adds a shaped recipe to the list of crafting recipes, using the forge format, with a custom group. + */ + public static void addOldShaped(String name, String group, ItemStack output, Object... input) { + ShapedPrimer primer = CraftingHelper.parseShaped(input); + addRecipe(j++, new ShapedRecipes(new ResourceLocation(MODID, group).toString(), primer.width, primer.height, + primer.input, output).setRegistryName(MODID, name)); + } + + /* + * This adds a shapeless recipe to the list of crafting recipes, using the forge format. + */ + public static void addOldShapeless(ItemStack output, Object... input) { + addRecipe(j++, new ShapelessRecipes(new ResourceLocation(MODID, "recipes" + j).toString(), output, + createInput(input))); + } + + /* + * This adds a shapeless recipe to the list of crafting recipes, using the forge format, with a custom group. + */ + public static void addOldShapeless(String group, ItemStack output, Object... input) { + addRecipe(j++, new ShapelessRecipes(new ResourceLocation(MODID, group).toString(), output, createInput(input))); + } + + public static void addOldShapeless(String name, String group, ItemStack output, Object... input) { + addRecipe(j++, new ShapelessRecipes(new ResourceLocation(MODID, group).toString(), output, createInput(input)) + .setRegistryName(MODID, name)); + } + + /* + * Adds a shapeless recipe with X output using an array of inputs. Use Strings for OreDictionary support. This array is not ordered. + */ + public static void addShapeless(ItemStack output, Object... inputs) { + addRecipe(j++, new ShapelessRecipes(MODID + ":" + j, output, createInput(inputs))); + } + + public static void addShapeless(Item output, Object... inputs) { + addShapeless(new ItemStack(output), inputs); + } + + public static void addShapeless(Block output, Object... inputs) { + addShapeless(new ItemStack(output), inputs); + } + + /* + * Adds a shapeless recipe with X output using an array of inputs. Use Strings for OreDictionary support. This array is not ordered. This has a custom group. + */ + public static void addShapeless(String group, ItemStack output, Object... inputs) { + addRecipe(j++, new ShapelessRecipes(MODID + ":" + group, output, createInput(inputs))); + } + + public static void addShapeless(String group, Item output, Object... inputs) { + addShapeless(group, new ItemStack(output), inputs); + } + + public static void addShapeless(String group, Block output, Object... inputs) { + addShapeless(group, new ItemStack(output), inputs); + } + + /* + * Adds a shapeless recipe with X output on a crafting grid that is W x H, using an array of inputs. Use null for nothing, use Strings for OreDictionary support, this array must have a length of width * height. + * This array is ordered, and items must follow from left to right, top to bottom of the crafting grid. + */ + public static void addShaped(ItemStack output, int width, int height, Object... input) { + addRecipe(j++, genShaped(output, width, height, input)); + } + + public static void addShaped(Item output, int width, int height, Object... input) { + addShaped(new ItemStack(output), width, height, input); + } + + public static void addShaped(Block output, int width, int height, Object... input) { + addShaped(new ItemStack(output), width, height, input); + } + + /* + * Adds a shapeless recipe with X output on a crafting grid that is W x H, using an array of inputs. Use null for nothing, use Strings for OreDictionary support, this array must have a length of width * height. + * This array is ordered, and items must follow from left to right, top to bottom of the crafting grid. This has a custom group. + */ + public static void addShaped(String group, ItemStack output, int width, int height, Object... input) { + addRecipe(j++, genShaped(MODID + ":" + group, output, width, height, input)); + } + + public static void addShaped(String group, Item output, int width, int height, Object... input) { + addShaped(group, new ItemStack(output), width, height, input); + } + + public static void addShaped(String group, Block output, int width, int height, Object... input) { + addShaped(group, new ItemStack(output), width, height, input); + } + + public static ShapedRecipes genShaped(ItemStack output, int l, int w, Object[] input) { + if (input[0] instanceof Object[]) + input = (Object[]) input[0]; + if (l * w != input.length) + throw new UnsupportedOperationException( + "Attempted to add invalid shaped recipe. Complain to the author of " + MODNAME); + NonNullList inputL = NonNullList.create(); + for (int i = 0; i < input.length; i++) { + Object k = input[i]; + if (k instanceof String) { + inputL.add(i, new OreIngredient((String) k)); + } else if (k instanceof ItemStack && !((ItemStack) k).isEmpty()) { + inputL.add(i, Ingredient.fromStacks((ItemStack) k)); + } else if (k instanceof Item) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Item) k))); + } else if (k instanceof Block) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Block) k))); + } else { + inputL.add(i, Ingredient.EMPTY); + } + } + + return new ShapedRecipes(MODID + ":" + j, l, w, inputL, output); + } + + public static ShapedRecipes genShaped(String group, ItemStack output, int l, int w, Object[] input) { + if (input[0] instanceof List) + input = ((List) input[0]).toArray(); + else if (input[0] instanceof Object[]) + input = (Object[]) input[0]; + if (l * w != input.length) + throw new UnsupportedOperationException( + "Attempted to add invalid shaped recipe. Complain to the author of " + MODNAME); + NonNullList inputL = NonNullList.create(); + for (int i = 0; i < input.length; i++) { + Object k = input[i]; + if (k instanceof String) { + inputL.add(i, new OreIngredient((String) k)); + } else if (k instanceof ItemStack && !((ItemStack) k).isEmpty()) { + inputL.add(i, Ingredient.fromStacks((ItemStack) k)); + } else if (k instanceof Item) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Item) k))); + } else if (k instanceof Block) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Block) k))); + } else { + inputL.add(i, Ingredient.EMPTY); + } + } + + return new ShapedRecipes(group, l, w, inputL, output); + } + + public static NonNullList createInput(Object[] input) { + if (input[0] instanceof List) + input = ((List) input[0]).toArray(); + else if (input[0] instanceof Object[]) + input = (Object[]) input[0]; + NonNullList inputL = NonNullList.create(); + for (int i = 0; i < input.length; i++) { + Object k = input[i]; + if (k instanceof String) { + inputL.add(i, new OreIngredient((String) k)); + } else if (k instanceof ItemStack) { + inputL.add(i, Ingredient.fromStacks((ItemStack) k)); + } else if (k instanceof Item) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Item) k))); + } else if (k instanceof Block) { + inputL.add(i, Ingredient.fromStacks(new ItemStack((Block) k))); + } else { + throw new UnsupportedOperationException( + "Attempted to add invalid shapeless recipe. Complain to the author of " + MODNAME); + } + } + return inputL; + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/block_black_lotus.json b/src/main/resources/assets/actuallyadditions/blockstates/block_black_lotus.json index 212b841e6..f86862426 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/block_black_lotus.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/block_black_lotus.json @@ -1,14 +1,22 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross", - "textures": { - "cross": "actuallyadditions:blocks/block_black_lotus" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross", + "textures": { + "cross": "actuallyadditions:blocks/block_black_lotus" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:blocks/block_black_lotus" + }, + "transform": "forge:default-item" + + + }] + } } \ No newline at end of file