diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 2bc22804e..b42d78301 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,5 +1,9 @@ package techreborn; +import java.io.File; + +import org.apache.commons.lang3.time.StopWatch; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -12,7 +16,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.commons.lang3.time.StopWatch; import reborncore.common.multiblock.MultiblockEventHandler; import reborncore.common.multiblock.MultiblockServerTickHandler; import reborncore.common.packets.AddDiscriminatorEvent; @@ -29,7 +32,13 @@ import techreborn.compat.ICompatModule; import techreborn.config.ConfigTechReborn; import techreborn.events.OreUnifier; import techreborn.events.TRTickHandler; -import techreborn.init.*; +import techreborn.init.ModBlocks; +import techreborn.init.ModFluids; +import techreborn.init.ModItems; +import techreborn.init.ModLoot; +import techreborn.init.ModParts; +import techreborn.init.ModRecipes; +import techreborn.init.RecipeCompact; import techreborn.lib.ModInfo; import techreborn.packets.PacketAesu; import techreborn.packets.PacketIdsu; @@ -38,8 +47,6 @@ import techreborn.tiles.idsu.IDSUManager; import techreborn.world.TROreGen; import techreborn.world.TreeGenerator; -import java.io.File; - @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.8.8,1.8.9]") public class Core { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/achievement/AchievementMod.java b/src/main/java/techreborn/achievement/AchievementMod.java index 4cc7e9f6b..1b6864748 100644 --- a/src/main/java/techreborn/achievement/AchievementMod.java +++ b/src/main/java/techreborn/achievement/AchievementMod.java @@ -1,13 +1,13 @@ package techreborn.achievement; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import java.util.ArrayList; -import java.util.List; - public class AchievementMod extends Achievement { public static List achievements = new ArrayList(); diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index 4ca34459b..50e840180 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -1,5 +1,9 @@ package techreborn.api; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -11,10 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - public class RollingMachineRecipe { private final List recipes = new ArrayList(); diff --git a/src/main/java/techreborn/api/recipe/BaseRecipe.java b/src/main/java/techreborn/api/recipe/BaseRecipe.java index da81cd469..2a944013d 100644 --- a/src/main/java/techreborn/api/recipe/BaseRecipe.java +++ b/src/main/java/techreborn/api/recipe/BaseRecipe.java @@ -1,11 +1,11 @@ package techreborn.api.recipe; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + /** * Extend this to add a recipe */ diff --git a/src/main/java/techreborn/api/recipe/IBaseRecipeType.java b/src/main/java/techreborn/api/recipe/IBaseRecipeType.java index cd47e0dfe..ff7d014bf 100644 --- a/src/main/java/techreborn/api/recipe/IBaseRecipeType.java +++ b/src/main/java/techreborn/api/recipe/IBaseRecipeType.java @@ -1,10 +1,10 @@ package techreborn.api.recipe; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import java.util.List; - /** * This is the base recipe class implement this to make a recipe handler */ diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index c4e41614c..9bbd4fa57 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -1,5 +1,7 @@ package techreborn.api.recipe; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import reborncore.api.power.IEnergyInterfaceTile; @@ -8,8 +10,6 @@ import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; -import java.util.ArrayList; - /** * Use this in your tile entity to craft things */ diff --git a/src/main/java/techreborn/api/recipe/RecipeHandler.java b/src/main/java/techreborn/api/recipe/RecipeHandler.java index c07097342..1b16d70d8 100644 --- a/src/main/java/techreborn/api/recipe/RecipeHandler.java +++ b/src/main/java/techreborn/api/recipe/RecipeHandler.java @@ -1,14 +1,15 @@ package techreborn.api.recipe; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.time.StopWatch; -import reborncore.common.util.ItemUtils; -import techreborn.Core; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.apache.commons.lang3.time.StopWatch; + +import net.minecraft.item.ItemStack; +import reborncore.common.util.ItemUtils; +import techreborn.Core; + public class RecipeHandler { diff --git a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java index cb5e9f505..224b3b154 100644 --- a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java +++ b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java @@ -1,15 +1,16 @@ package techreborn.api.recipe.recipeConfig; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.item.ItemStack; -import techreborn.api.recipe.IBaseRecipeType; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.IBaseRecipeType; + public class RecipeConfigManager { public static ArrayList configs = new ArrayList(); diff --git a/src/main/java/techreborn/api/upgrade/UpgradeHandler.java b/src/main/java/techreborn/api/upgrade/UpgradeHandler.java index 575a18b26..210cc774c 100644 --- a/src/main/java/techreborn/api/upgrade/UpgradeHandler.java +++ b/src/main/java/techreborn/api/upgrade/UpgradeHandler.java @@ -1,11 +1,11 @@ package techreborn.api.upgrade; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; -import java.util.ArrayList; - public class UpgradeHandler { RecipeCrafter crafter; diff --git a/src/main/java/techreborn/asm/LoadingPlugin.java b/src/main/java/techreborn/asm/LoadingPlugin.java index d919b9547..657e87891 100644 --- a/src/main/java/techreborn/asm/LoadingPlugin.java +++ b/src/main/java/techreborn/asm/LoadingPlugin.java @@ -1,13 +1,13 @@ package techreborn.asm; +import java.util.Map; + import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.ModMetadata; import net.minecraftforge.fml.relauncher.IFMLCallHook; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import techreborn.lib.ModInfo; -import java.util.Map; - @IFMLLoadingPlugin.MCVersion("1.7.10") public class LoadingPlugin implements IFMLLoadingPlugin { diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index c50e31169..b52bbd0b9 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,9 +23,6 @@ import reborncore.common.multiblock.BlockMultiblockBase; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileMachineCasing; -import java.util.List; -import java.util.Random; - public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock { public static final String[] types = new String[] diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index e9116c603..a1ec2674e 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,9 +18,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; -import java.security.InvalidParameterException; -import java.util.List; - public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { public PropertyInteger METADATA; diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index c7bf12ce1..db89231dd 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,5 +1,10 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -26,11 +31,6 @@ import techreborn.init.ModBlocks; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public class BlockOre extends BaseBlock implements ITexturedBlock { public static ItemStack getOreByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 071e10681..1e4267286 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -7,29 +10,17 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.BaseBlock; -import reborncore.common.util.OreDrop; -import reborncore.common.util.OreDropSet; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import techreborn.items.ItemDusts; -import techreborn.items.ItemGems; - -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; public class BlockOre2 extends BaseBlock implements ITexturedBlock { diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index c66416bcf..cf1e1c7bc 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -1,6 +1,9 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -24,9 +27,6 @@ import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TilePlayerDectector; -import java.util.List; -import java.util.Random; - public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock { public PropertyInteger METADATA; diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index fad2afebd..d3fd72b4f 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.IOpaqueBlock; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.BlockLeaves; @@ -20,9 +23,6 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.util.List; -import java.util.Random; - /** * Created by mark on 20/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 8f1d66a61..cb3b89ff8 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -1,5 +1,9 @@ package techreborn.blocks; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -19,10 +23,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.items.ItemParts; import techreborn.items.tools.ItemTreeTap; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - /** * Created by mark on 19/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 0c8323d7f..99e6041b2 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import net.minecraft.block.BlockSapling; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -10,9 +13,6 @@ import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.world.RubberTreeGenerator; -import java.util.List; -import java.util.Random; - /** * Created by Mark on 20/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 98a8ed1c0..4eb24aacc 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,9 +18,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.util.List; -import java.util.Random; - public class BlockStorage extends BaseBlock implements ITexturedBlock { public static ItemStack getStorageBlockByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index bb44dc083..fcbf1bae3 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -1,5 +1,9 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,10 +19,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.security.InvalidParameterException; -import java.util.List; -import java.util.Random; - public class BlockStorage2 extends BaseBlock implements ITexturedBlock { public static ItemStack getStorageBlockByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 7abec0514..4ac956f59 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -3,7 +3,6 @@ package techreborn.blocks.generator; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 04bb77aad..b303bcee2 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -4,10 +4,91 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import techreborn.client.container.*; -import techreborn.client.gui.*; +import techreborn.client.container.ContainerAesu; +import techreborn.client.container.ContainerAlloyFurnace; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerAssemblingMachine; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChargeBench; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.client.container.ContainerChunkloader; +import techreborn.client.container.ContainerCompressor; +import techreborn.client.container.ContainerDestructoPack; +import techreborn.client.container.ContainerDieselGenerator; +import techreborn.client.container.ContainerDigitalChest; +import techreborn.client.container.ContainerElectricFurnace; +import techreborn.client.container.ContainerExtractor; +import techreborn.client.container.ContainerFusionReactor; +import techreborn.client.container.ContainerGasTurbine; +import techreborn.client.container.ContainerGenerator; +import techreborn.client.container.ContainerGrinder; +import techreborn.client.container.ContainerIDSU; +import techreborn.client.container.ContainerImplosionCompressor; +import techreborn.client.container.ContainerIndustrialElectrolyzer; +import techreborn.client.container.ContainerIndustrialGrinder; +import techreborn.client.container.ContainerIndustrialSawmill; +import techreborn.client.container.ContainerLesu; +import techreborn.client.container.ContainerMatterFabricator; +import techreborn.client.container.ContainerQuantumChest; +import techreborn.client.container.ContainerQuantumTank; +import techreborn.client.container.ContainerRollingMachine; +import techreborn.client.container.ContainerSemifluidGenerator; +import techreborn.client.container.ContainerThermalGenerator; +import techreborn.client.container.ContainerVacuumFreezer; +import techreborn.client.gui.GuiAesu; +import techreborn.client.gui.GuiAlloyFurnace; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiAssemblingMachine; +import techreborn.client.gui.GuiBlastFurnace; +import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChargeBench; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiChunkLoader; +import techreborn.client.gui.GuiCompressor; +import techreborn.client.gui.GuiDestructoPack; +import techreborn.client.gui.GuiDieselGenerator; +import techreborn.client.gui.GuiDigitalChest; +import techreborn.client.gui.GuiElectricFurnace; +import techreborn.client.gui.GuiExtractor; +import techreborn.client.gui.GuiFusionReactor; +import techreborn.client.gui.GuiGasTurbine; +import techreborn.client.gui.GuiGenerator; +import techreborn.client.gui.GuiGrinder; +import techreborn.client.gui.GuiIDSU; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.client.gui.GuiIndustrialElectrolyzer; +import techreborn.client.gui.GuiIndustrialGrinder; +import techreborn.client.gui.GuiIndustrialSawmill; +import techreborn.client.gui.GuiLesu; +import techreborn.client.gui.GuiMatterFabricator; +import techreborn.client.gui.GuiQuantumChest; +import techreborn.client.gui.GuiQuantumTank; +import techreborn.client.gui.GuiRollingMachine; +import techreborn.client.gui.GuiSemifluidGenerator; +import techreborn.client.gui.GuiThermalGenerator; +import techreborn.client.gui.GuiVacuumFreezer; import techreborn.manual.GuiManual; -import techreborn.tiles.*; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialGrinder; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.TileVacuumFreezer; import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.generator.TileDieselGenerator; import techreborn.tiles.generator.TileGasTurbine; diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index f5f810c71..9a3d01aa1 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -1,13 +1,15 @@ package techreborn.client; +import org.lwjgl.input.Keyboard; + import com.mojang.realmsclient.gui.ChatFormatting; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.input.Keyboard; import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.common.powerSystem.PowerSystem; diff --git a/src/main/java/techreborn/client/VersionCheckerClient.java b/src/main/java/techreborn/client/VersionCheckerClient.java index 839e69d4e..7d2e1ffc0 100644 --- a/src/main/java/techreborn/client/VersionCheckerClient.java +++ b/src/main/java/techreborn/client/VersionCheckerClient.java @@ -1,5 +1,8 @@ package techreborn.client; +import java.awt.Color; +import java.util.ArrayList; + import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.client.GuiModList; @@ -7,9 +10,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import reborncore.client.gui.GuiUtil; import techreborn.Core; -import java.awt.*; -import java.util.ArrayList; - public class VersionCheckerClient { ResourceLocation texture; diff --git a/src/main/java/techreborn/client/gui/GuiAesu.java b/src/main/java/techreborn/client/gui/GuiAesu.java index 024e4b1db..21d21c60a 100644 --- a/src/main/java/techreborn/client/gui/GuiAesu.java +++ b/src/main/java/techreborn/client/gui/GuiAesu.java @@ -1,5 +1,8 @@ package techreborn.client.gui; +import java.awt.Color; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -12,9 +15,6 @@ import techreborn.client.container.ContainerAesu; import techreborn.packets.PacketAesu; import techreborn.tiles.TileAesu; -import java.awt.*; -import java.io.IOException; - public class GuiAesu extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index d3fde51de..96f583dce 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -18,8 +20,6 @@ import techreborn.init.ModBlocks; import techreborn.proxies.ClientProxy; import techreborn.tiles.TileBlastFurnace; -import java.io.IOException; - public class GuiBlastFurnace extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 147264b99..42b17627b 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -17,8 +19,6 @@ import techreborn.client.container.ContainerFusionReactor; import techreborn.proxies.ClientProxy; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import java.io.IOException; - public class GuiFusionReactor extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index d101a2107..da6263eea 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -3,7 +3,6 @@ package techreborn.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import reborncore.common.powerSystem.PowerSystem; diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index f96265a63..94cbea00e 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -1,5 +1,8 @@ package techreborn.client.gui; +import java.awt.Color; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -12,9 +15,6 @@ import techreborn.client.container.ContainerIDSU; import techreborn.packets.PacketIdsu; import techreborn.tiles.idsu.TileIDSU; -import java.awt.*; -import java.io.IOException; - public class GuiIDSU extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiLesu.java b/src/main/java/techreborn/client/gui/GuiLesu.java index 84c3f19ea..c9b82e0b6 100644 --- a/src/main/java/techreborn/client/gui/GuiLesu.java +++ b/src/main/java/techreborn/client/gui/GuiLesu.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.awt.Color; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.client.container.ContainerLesu; import techreborn.tiles.lesu.TileLesu; -import java.awt.*; - public class GuiLesu extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index bf2f91057..7b23cb2f9 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -16,8 +18,6 @@ import techreborn.client.container.ContainerVacuumFreezer; import techreborn.proxies.ClientProxy; import techreborn.tiles.TileVacuumFreezer; -import java.io.IOException; - public class GuiVacuumFreezer extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/vacuum_freezer.png"); diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 6d5f4feaa..67f09a410 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -1,5 +1,7 @@ package techreborn.client.hud; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; @@ -12,7 +14,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.Color; diff --git a/src/main/java/techreborn/client/keybindings/KeyBindings.java b/src/main/java/techreborn/client/keybindings/KeyBindings.java index 65eae60d0..210c89615 100644 --- a/src/main/java/techreborn/client/keybindings/KeyBindings.java +++ b/src/main/java/techreborn/client/keybindings/KeyBindings.java @@ -1,7 +1,8 @@ package techreborn.client.keybindings; -import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; + +import net.minecraft.client.settings.KeyBinding; import techreborn.lib.ModInfo; public class KeyBindings { diff --git a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java index 0a9acdc7c..a17f18d18 100644 --- a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java @@ -1,5 +1,10 @@ package techreborn.client.texture; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IResource; @@ -9,10 +14,6 @@ import net.minecraft.util.ResourceLocation; import reborncore.client.texture.ConnectedTexture; import techreborn.lib.ModInfo; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; - //1.8 Nope public class CasingConnectedTextureGenerator extends TextureAtlasSprite { diff --git a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java index 5f9a3c3c3..6bd165eda 100644 --- a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java @@ -1,5 +1,10 @@ package techreborn.client.texture; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IResource; @@ -9,10 +14,6 @@ import net.minecraft.util.ResourceLocation; import reborncore.client.texture.ConnectedTexture; import techreborn.lib.ModInfo; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; - //TODO 1.8 nope public class LesuConnectedTextureGenerator extends TextureAtlasSprite { diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index d6ce2a7a4..9e49c2b60 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -1,13 +1,13 @@ package techreborn.compat; +import java.util.ArrayList; + import net.minecraftforge.fml.common.Loader; import techreborn.compat.minetweaker.MinetweakerCompat; import techreborn.compat.recipes.RecipesBiomesOPlenty; import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; -import java.util.ArrayList; - public class CompatManager { public ArrayList compatModules = new ArrayList(); diff --git a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index 8b93d0e54..9d530c483 100644 --- a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -1,13 +1,18 @@ package techreborn.compat.jei; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.BaseRecipe; -import javax.annotation.Nonnull; -import java.util.*; - public abstract class BaseRecipeWrapper extends BlankRecipeWrapper { protected final T baseRecipe; @Nonnull diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index c940b7c2c..e24c6be43 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -1,5 +1,12 @@ package techreborn.compat.jei; +import java.awt.Color; +import java.text.NumberFormat; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; @@ -9,12 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.*; -import java.text.NumberFormat; -import java.util.List; - public class RecipeUtil { private static final int color = Color.darkGray.getRGB(); diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 35f8de9ed..5f0639332 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -1,5 +1,10 @@ package techreborn.compat.jei; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; @@ -13,8 +18,34 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; -import techreborn.client.container.*; -import techreborn.client.gui.*; +import techreborn.client.container.ContainerAlloyFurnace; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerAssemblingMachine; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.client.container.ContainerFusionReactor; +import techreborn.client.container.ContainerGrinder; +import techreborn.client.container.ContainerImplosionCompressor; +import techreborn.client.container.ContainerIndustrialElectrolyzer; +import techreborn.client.container.ContainerIndustrialGrinder; +import techreborn.client.container.ContainerIndustrialSawmill; +import techreborn.client.container.ContainerRollingMachine; +import techreborn.client.container.ContainerVacuumFreezer; +import techreborn.client.gui.GuiAlloyFurnace; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiAssemblingMachine; +import techreborn.client.gui.GuiBlastFurnace; +import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiFusionReactor; +import techreborn.client.gui.GuiGrinder; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.client.gui.GuiIndustrialElectrolyzer; +import techreborn.client.gui.GuiIndustrialGrinder; +import techreborn.client.gui.GuiIndustrialSawmill; +import techreborn.client.gui.GuiRollingMachine; +import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler; import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory; @@ -43,10 +74,6 @@ import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - @mezz.jei.api.JEIPlugin public class TechRebornJeiPlugin extends BlankModPlugin { @Override diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index d1bdeeadb..62a09c275 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiAlloySmelter; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java index a416cf0d1..f4d51a07a 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java index 6c5c9c1c2..e6402e2ea 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.client.gui.GuiAlloySmelter; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated arrow; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java index 79f738a0b..525f7c8a2 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiAssemblingMachine; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java index 5c06e8903..fe95e6b48 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java index 075bd5973..2cfa501f7 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.client.gui.GuiAssemblingMachine; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java index 6222fc4c1..ad7f9b29f 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiBlastFurnace; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3}; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java index b232c8b5b..cdeca5537 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.BlastFurnaceRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java index 2ec4f6c44..ca510df44 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.BlastFurnaceRecipe; import techreborn.client.gui.GuiBlastFurnace; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java index a18ca11f6..af4ac41ad 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiCentrifuge; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class CentrifugeRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java index a48c90e4e..9f4d1fcc7 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.CentrifugeRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class CentrifugeRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java index 0b7cfb776..a01ea51ee 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.CentrifugeRecipe; import techreborn.client.gui.GuiCentrifuge; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class CentrifugeRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progressUp; private final IDrawableAnimated progressLeft; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java index 039f005e1..3ff1db3e6 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiChemicalReactor; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java index d36aaf352..9c681308e 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.ChemicalReactorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java index 191aaa23f..def0468df 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.ChemicalReactorRecipe; import techreborn.client.gui.GuiChemicalReactor; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index a374ebed0..299992597 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.fusionReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -10,8 +12,6 @@ import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiFusionReactor; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class FusionReactorRecipeCategory extends BlankRecipeCategory { private static final int inputSlotTop = 0; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java index 0afe60fb8..ce9af95c2 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java @@ -1,12 +1,12 @@ package techreborn.compat.jei.fusionReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class FusionReactorRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java index d68c532e7..5b2dcf54f 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java @@ -1,16 +1,17 @@ package techreborn.compat.jei.fusionReactor; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class FusionReactorRecipeWrapper extends BlankRecipeWrapper { private final FusionReactorRecipe baseRecipe; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java index 45632e1b2..2d8616898 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -8,12 +10,9 @@ import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class GrinderRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0}; private static final int[] OUTPUT_SLOTS = {1}; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java index 38d2a19ac..14feeedd9 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java @@ -1,14 +1,13 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.GrinderRecipe; -import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class GrinderRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java index c0f5cf530..a29384ffe 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java @@ -1,18 +1,16 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import techreborn.api.recipe.machines.GrinderRecipe; -import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class GrinderRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index 60900b1a1..1e28d798a 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiImplosionCompressor; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3}; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java index 483daaa87..d5f833660 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java index 9ddf0c061..a6705f65f 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.ImplosionCompressorRecipe; import techreborn.client.gui.GuiImplosionCompressor; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java index 2f78d4544..693d599ce 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiIndustrialElectrolyzer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java index e199e20de..2c8a8fb08 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java index b249e135c..6fc7544dc 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.client.gui.GuiIndustrialElectrolyzer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java index e5a429719..4cea09034 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialGrinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; @@ -14,8 +16,6 @@ import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; import techreborn.tiles.TileIndustrialGrinder; -import javax.annotation.Nonnull; - public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java index 430f84c37..333524df5 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialGrinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialGrinderRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java index 16da76a38..fd7d20b03 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.industrialGrinder; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -10,10 +15,6 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.client.gui.GuiIndustrialGrinder; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java index 04cf32622..beb58786c 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialSawmill; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; @@ -14,8 +16,6 @@ import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; import techreborn.tiles.TileIndustrialSawmill; -import javax.annotation.Nonnull; - public class IndustrialSawmillRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4}; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java index a10b6430b..ae463e950 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialSawmill; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialSawmillRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java index 0bef098a2..5fc9b297c 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.industrialSawmill; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -10,10 +15,6 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.client.gui.GuiIndustrialSawmill; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java index 5da90110e..70ed7ac4f 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java @@ -1,7 +1,14 @@ package techreborn.compat.jei.rollingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.ICraftingGridHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -9,8 +16,6 @@ import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiRollingMachine; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class RollingMachineRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; private static final int[] OUTPUT_SLOTS = {10}; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java index b2017e2f9..903482501 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java @@ -1,11 +1,11 @@ package techreborn.compat.jei.rollingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class RollingMachineRecipeHandler implements IRecipeHandler { @Nonnull @Override diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java index fce13a83c..b8c29c954 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java @@ -1,11 +1,11 @@ package techreborn.compat.jei.rollingMachine; -import net.minecraft.item.crafting.IRecipe; -import techreborn.api.RollingMachineRecipe; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.crafting.IRecipe; +import techreborn.api.RollingMachineRecipe; + public class RollingMachineRecipeMaker { private RollingMachineRecipeMaker() { diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java index 21a4284ea..efa024ff3 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.rollingMachine; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper; @@ -13,10 +18,6 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper { private final ICraftingRecipeWrapper baseRecipe; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java index ec2c95ad8..71293c83c 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0}; private static final int[] OUTPUT_SLOTS = {1}; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java index 1e7fd685e..75d125bd0 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java index cc032f54e..6e63f3daf 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java b/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java index cc9628629..8ce1a77b2 100644 --- a/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java +++ b/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import java.util.ArrayList; +import java.util.List; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -12,9 +15,6 @@ import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; -import java.util.ArrayList; -import java.util.List; - @ZenClass("mods.techreborn.fusionReactor") public class MTFusionReactor { diff --git a/src/main/java/techreborn/compat/minetweaker/MTGeneric.java b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java index 26b8dba5e..442d2bc92 100644 --- a/src/main/java/techreborn/compat/minetweaker/MTGeneric.java +++ b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import java.util.ArrayList; +import java.util.List; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -10,9 +13,6 @@ import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.IBaseRecipeType; import techreborn.api.recipe.RecipeHandler; -import java.util.ArrayList; -import java.util.List; - public class MTGeneric { public static String getMachineName() { return null; diff --git a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java index 256196faf..b05fad1b4 100644 --- a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java +++ b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -15,9 +18,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import techreborn.compat.ICompatModule; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack; - public class MinetweakerCompat implements ICompatModule { @Override diff --git a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java index 7aadd566a..ff6606060 100644 --- a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java +++ b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java @@ -1,7 +1,11 @@ package techreborn.compat.waila; import mcp.mobius.waila.api.IWailaRegistrar; -import net.minecraftforge.fml.common.event.*; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import reborncore.common.tile.TileMachineBase; import techreborn.compat.ICompatModule; diff --git a/src/main/java/techreborn/compat/waila/WailaProviderMachines.java b/src/main/java/techreborn/compat/waila/WailaProviderMachines.java index 56e1769e4..624e3a8fb 100644 --- a/src/main/java/techreborn/compat/waila/WailaProviderMachines.java +++ b/src/main/java/techreborn/compat/waila/WailaProviderMachines.java @@ -1,5 +1,8 @@ package techreborn.compat.waila; +import java.util.ArrayList; +import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -11,9 +14,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import reborncore.api.IListInfoProvider; -import java.util.ArrayList; -import java.util.List; - public class WailaProviderMachines implements IWailaDataProvider { private List info = new ArrayList(); diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 1187d4843..bf9f8bf6e 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,9 +1,9 @@ package techreborn.config; -import net.minecraftforge.common.config.Configuration; - import java.io.File; +import net.minecraftforge.common.config.Configuration; + public class ConfigTechReborn { private static ConfigTechReborn instance = null; public static String CATEGORY_WORLD = "world"; diff --git a/src/main/java/techreborn/config/TechRebornConfigGui.java b/src/main/java/techreborn/config/TechRebornConfigGui.java index 866c5def2..e94a7682f 100644 --- a/src/main/java/techreborn/config/TechRebornConfigGui.java +++ b/src/main/java/techreborn/config/TechRebornConfigGui.java @@ -1,5 +1,8 @@ package techreborn.config; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigElement; @@ -10,9 +13,6 @@ import net.minecraftforge.fml.client.config.GuiConfigEntries; import net.minecraftforge.fml.client.config.GuiConfigEntries.CategoryEntry; import net.minecraftforge.fml.client.config.IConfigElement; -import java.util.ArrayList; -import java.util.List; - public class TechRebornConfigGui extends GuiConfig { public TechRebornConfigGui(GuiScreen top) { super(top, getConfigCategories(), "TechReborn", false, false, GuiConfig diff --git a/src/main/java/techreborn/config/TechRebornGUIFactory.java b/src/main/java/techreborn/config/TechRebornGUIFactory.java index db9b0e1f5..795616339 100644 --- a/src/main/java/techreborn/config/TechRebornGUIFactory.java +++ b/src/main/java/techreborn/config/TechRebornGUIFactory.java @@ -1,11 +1,11 @@ package techreborn.config; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; -import java.util.Set; - public class TechRebornGUIFactory implements IModGuiFactory { @Override public void initialize(Minecraft minecraftInstance) { diff --git a/src/main/java/techreborn/events/OreUnifier.java b/src/main/java/techreborn/events/OreUnifier.java index 086fe3d81..b9206e1cd 100644 --- a/src/main/java/techreborn/events/OreUnifier.java +++ b/src/main/java/techreborn/events/OreUnifier.java @@ -1,5 +1,7 @@ package techreborn.events; +import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import java.util.HashMap; - public class OreUnifier { public static HashMap oreHash = new HashMap(); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index b90920c1e..e5cd45b95 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -8,9 +8,57 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; import techreborn.Core; -import techreborn.blocks.*; -import techreborn.blocks.generator.*; -import techreborn.blocks.machine.*; +import techreborn.blocks.BlockChunkLoader; +import techreborn.blocks.BlockComputerCube; +import techreborn.blocks.BlockDigitalChest; +import techreborn.blocks.BlockElectricCraftingTable; +import techreborn.blocks.BlockFusionCoil; +import techreborn.blocks.BlockFusionControlComputer; +import techreborn.blocks.BlockHighlyAdvancedMachine; +import techreborn.blocks.BlockIronFence; +import techreborn.blocks.BlockMachineCasing; +import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockOre; +import techreborn.blocks.BlockOre2; +import techreborn.blocks.BlockPlayerDetector; +import techreborn.blocks.BlockQuantumChest; +import techreborn.blocks.BlockQuantumTank; +import techreborn.blocks.BlockRubberLeaves; +import techreborn.blocks.BlockRubberLog; +import techreborn.blocks.BlockRubberPlank; +import techreborn.blocks.BlockRubberSapling; +import techreborn.blocks.BlockStorage; +import techreborn.blocks.BlockStorage2; +import techreborn.blocks.BlockSupercondensator; +import techreborn.blocks.generator.BlockDieselGenerator; +import techreborn.blocks.generator.BlockDragonEggSiphoner; +import techreborn.blocks.generator.BlockGasTurbine; +import techreborn.blocks.generator.BlockGenerator; +import techreborn.blocks.generator.BlockHeatGenerator; +import techreborn.blocks.generator.BlockLightningRod; +import techreborn.blocks.generator.BlockMagicEnergyAbsorber; +import techreborn.blocks.generator.BlockMagicEnergyConverter; +import techreborn.blocks.generator.BlockPlasmaGenerator; +import techreborn.blocks.generator.BlockSemiFluidGenerator; +import techreborn.blocks.generator.BlockSolarPanel; +import techreborn.blocks.generator.BlockThermalGenerator; +import techreborn.blocks.generator.BlockWaterMill; +import techreborn.blocks.generator.BlockWindMill; +import techreborn.blocks.machine.BlockAlloyFurnace; +import techreborn.blocks.machine.BlockAlloySmelter; +import techreborn.blocks.machine.BlockAssemblingMachine; +import techreborn.blocks.machine.BlockBlastFurnace; +import techreborn.blocks.machine.BlockCentrifuge; +import techreborn.blocks.machine.BlockChargeBench; +import techreborn.blocks.machine.BlockChemicalReactor; +import techreborn.blocks.machine.BlockDistillationTower; +import techreborn.blocks.machine.BlockImplosionCompressor; +import techreborn.blocks.machine.BlockIndustrialElectrolyzer; +import techreborn.blocks.machine.BlockIndustrialGrinder; +import techreborn.blocks.machine.BlockIndustrialSawmill; +import techreborn.blocks.machine.BlockMatterFabricator; +import techreborn.blocks.machine.BlockRollingMachine; +import techreborn.blocks.machine.BlockVacuumFreezer; import techreborn.blocks.storage.BlockAesu; import techreborn.blocks.storage.BlockIDSU; import techreborn.blocks.storage.BlockLesu; @@ -19,10 +67,50 @@ import techreborn.blocks.teir1.BlockCompressor; import techreborn.blocks.teir1.BlockElectricFurnace; import techreborn.blocks.teir1.BlockExtractor; import techreborn.blocks.teir1.BlockGrinder; -import techreborn.itemblocks.*; -import techreborn.tiles.*; +import techreborn.itemblocks.ItemBlockAesu; +import techreborn.itemblocks.ItemBlockDigitalChest; +import techreborn.itemblocks.ItemBlockMachineCasing; +import techreborn.itemblocks.ItemBlockMachineFrame; +import techreborn.itemblocks.ItemBlockOre; +import techreborn.itemblocks.ItemBlockOre2; +import techreborn.itemblocks.ItemBlockPlayerDetector; +import techreborn.itemblocks.ItemBlockQuantumChest; +import techreborn.itemblocks.ItemBlockQuantumTank; +import techreborn.itemblocks.ItemBlockRubberSapling; +import techreborn.itemblocks.ItemBlockStorage; +import techreborn.itemblocks.ItemBlockStorage2; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialGrinder; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileMachineCasing; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TilePlayerDectector; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.TileVacuumFreezer; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import techreborn.tiles.generator.*; +import techreborn.tiles.generator.TileDieselGenerator; +import techreborn.tiles.generator.TileDragonEggSiphoner; +import techreborn.tiles.generator.TileGasTurbine; +import techreborn.tiles.generator.TileGenerator; +import techreborn.tiles.generator.TileHeatGenerator; +import techreborn.tiles.generator.TileSemifluidGenerator; +import techreborn.tiles.generator.TileSolarPanel; +import techreborn.tiles.generator.TileWaterMill; +import techreborn.tiles.generator.TileWindMill; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 0c4937439..42f548d9c 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -12,10 +12,36 @@ import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.events.OreUnifier; -import techreborn.items.*; +import techreborn.items.ItemCells; +import techreborn.items.ItemCrushedOre; +import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemLapotronicOrb; +import techreborn.items.ItemLithiumBattery; +import techreborn.items.ItemMissingRecipe; +import techreborn.items.ItemNuggets; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; +import techreborn.items.ItemPurifiedCrushedOre; +import techreborn.items.ItemReBattery; +import techreborn.items.ItemUUmatter; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; -import techreborn.items.tools.*; +import techreborn.items.tools.ItemAdvancedChainsaw; +import techreborn.items.tools.ItemAdvancedDrill; +import techreborn.items.tools.ItemChainsaw; +import techreborn.items.tools.ItemCloakingDevice; +import techreborn.items.tools.ItemDiamondChainsaw; +import techreborn.items.tools.ItemDiamondDrill; +import techreborn.items.tools.ItemDrill; +import techreborn.items.tools.ItemFluidbucket; +import techreborn.items.tools.ItemHammer; +import techreborn.items.tools.ItemOmniTool; +import techreborn.items.tools.ItemRockCutter; +import techreborn.items.tools.ItemTechManual; +import techreborn.items.tools.ItemTreeTap; public class ModItems { diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index 25da3be4a..16fe2dae8 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -1,13 +1,13 @@ package techreborn.init; +import java.util.Arrays; + import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import techreborn.config.ConfigTechReborn; import techreborn.items.ItemIngots; -import java.util.Arrays; - public class ModLoot { public static WeightedRandomChestContent rubberSaplingLoot = new WeightedRandomChestContent(new ItemStack(ModBlocks.rubberSapling), 1, 3, 25); diff --git a/src/main/java/techreborn/init/ModParts.java b/src/main/java/techreborn/init/ModParts.java index 6044e1c63..e41ed04c4 100644 --- a/src/main/java/techreborn/init/ModParts.java +++ b/src/main/java/techreborn/init/ModParts.java @@ -1,9 +1,9 @@ package techreborn.init; -import net.minecraft.item.ItemStack; - import java.util.HashMap; +import net.minecraft.item.ItemStack; + public class ModParts { public static HashMap stackCable = new HashMap(); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index aefa1efd8..296995cf8 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -1,5 +1,9 @@ package techreborn.init; +import java.security.InvalidParameterException; + +import org.apache.commons.lang3.ArrayUtils; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -8,7 +12,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.ArrayUtils; import reborncore.common.util.CraftingHelper; import reborncore.common.util.OreUtil; import techreborn.Core; @@ -16,18 +19,33 @@ import techreborn.api.TechRebornAPI; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.*; +import techreborn.api.recipe.machines.AlloySmelterRecipe; +import techreborn.api.recipe.machines.BlastFurnaceRecipe; +import techreborn.api.recipe.machines.CentrifugeRecipe; +import techreborn.api.recipe.machines.ChemicalReactorRecipe; +import techreborn.api.recipe.machines.GrinderRecipe; +import techreborn.api.recipe.machines.ImplosionCompressorRecipe; +import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; +import techreborn.api.recipe.machines.IndustrialGrinderRecipe; +import techreborn.api.recipe.machines.IndustrialSawmillRecipe; +import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; +import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre2; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage2; import techreborn.config.ConfigTechReborn; -import techreborn.items.*; +import techreborn.items.ItemCells; +import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemNuggets; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; import techreborn.utils.RecipeUtils; -import java.security.InvalidParameterException; - public class ModRecipes { public static ConfigTechReborn config; @@ -100,7 +118,7 @@ public class static void addHammerRecipes(){ CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.hammer), "III", - " S ", + "ISI", " S ", 'S', Items.stick, 'I', "ingotIron"); diff --git a/src/main/java/techreborn/init/RecipeCompact.java b/src/main/java/techreborn/init/RecipeCompact.java index 8db6674e9..8616c9f1a 100644 --- a/src/main/java/techreborn/init/RecipeCompact.java +++ b/src/main/java/techreborn/init/RecipeCompact.java @@ -1,5 +1,12 @@ package techreborn.init; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -10,13 +17,6 @@ import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.items.ItemPlates; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; - public class RecipeCompact implements IRecipeCompact { HashMap recipes = new HashMap<>(); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java index d734d1daa..cff2a5797 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -17,8 +19,6 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.init.ModBlocks; import techreborn.tiles.TileAesu; -import java.util.List; - public class ItemBlockAesu extends ItemBlock { public ItemBlockAesu(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java index eae6ace27..dc28200a7 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +14,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.tiles.TileDigitalChest; -import java.util.List; - public class ItemBlockDigitalChest extends ItemBlock { public ItemBlockDigitalChest(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockOre2.java b/src/main/java/techreborn/itemblocks/ItemBlockOre2.java index 80a7e774f..57ef610c9 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockOre2.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockOre2.java @@ -2,7 +2,6 @@ package techreborn.itemblocks; import net.minecraft.block.Block; import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre2; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java index 1f4c59706..bf6338ae9 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +14,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.tiles.TileQuantumChest; -import java.util.List; - public class ItemBlockQuantumChest extends ItemBlock { public ItemBlockQuantumChest(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index 442c94388..7b43de23f 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,8 +14,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.util.List; - public class ItemCells extends ItemTextureBase implements IFluidContainerItem { public static ItemStack getCellByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemCrushedOre.java b/src/main/java/techreborn/items/ItemCrushedOre.java index bbe66c263..1e12a8001 100644 --- a/src/main/java/techreborn/items/ItemCrushedOre.java +++ b/src/main/java/techreborn/items/ItemCrushedOre.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemCrushedOre extends ItemTextureBase { public static ItemStack getCrushedOreByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index ee7e831b0..61fefd58a 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -8,9 +11,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemDusts extends ItemTextureBase { public static ItemStack getDustByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 8074d8d9e..1592c4f56 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemDustsSmall extends ItemTextureBase { public static ItemStack getSmallDustByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index eba89ed6e..d406930cf 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemGems extends ItemTextureBase { public static ItemStack getGemByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index b835afb7b..e9a3f18c0 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemIngots extends ItemTextureBase { public static ItemStack getIngotByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemLithiumBattery.java b/src/main/java/techreborn/items/ItemLithiumBattery.java index 1c09c7b81..cafbbcc82 100644 --- a/src/main/java/techreborn/items/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/ItemLithiumBattery.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemLithiumBattery extends ItemTextureBase implements IEnergyItemInfo { public ItemLithiumBattery() { diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 12ed8d054..856a42211 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemNuggets extends ItemTextureBase { public static ItemStack getNuggetByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 08be719b0..88d714e7f 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,9 +14,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemParts extends ItemTextureBase { public static ItemStack getPartByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 22bac53e6..73b6a4e39 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemPlates extends ItemTextureBase { public static ItemStack getPlateByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java index c0ff62860..a81bab8d9 100644 --- a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java +++ b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemPurifiedCrushedOre extends ItemTextureBase { public static ItemStack getPurifiedCrushedOreByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemReBattery.java b/src/main/java/techreborn/items/ItemReBattery.java index 8a4ef54bf..90769fea0 100644 --- a/src/main/java/techreborn/items/ItemReBattery.java +++ b/src/main/java/techreborn/items/ItemReBattery.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemReBattery extends ItemTextureBase implements IEnergyItemInfo { public ItemReBattery() { diff --git a/src/main/java/techreborn/items/ItemUpgrade.java b/src/main/java/techreborn/items/ItemUpgrade.java index 1ab76271f..ee1f1a30e 100644 --- a/src/main/java/techreborn/items/ItemUpgrade.java +++ b/src/main/java/techreborn/items/ItemUpgrade.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import techreborn.api.upgrade.IMachineUpgrade; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemUpgrade extends ItemTR implements IMachineUpgrade { public static ItemStack getUpgradeByName(String name, int count) { diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index d5a1bae99..f32e16ebc 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -1,6 +1,8 @@ package techreborn.items.armor; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -15,8 +17,6 @@ import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 4796baeb2..308e01535 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -1,5 +1,7 @@ package techreborn.items.armor; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -14,8 +16,6 @@ import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index d08a16cb4..9484622c7 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 33d0ea490..3371c0299 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.AdvancedDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 760b516ba..4fc009ee9 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index f15b88488..f1e1690f0 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +17,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.items.ItemTextureBase; -import java.util.List; - public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo { public static int Teir = ConfigTechReborn.CloakingDeviceTier; public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index e58e0df51..2cbcd7cfb 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 2facb6d05..bcfb62cd3 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemDiamondDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.DiamondDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 61d39c121..f867ee8f7 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.IronDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 34f04b84a..5430f588f 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -23,8 +25,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.OmniToolCharge; diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 4ab9652a6..ed29abb1e 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -19,8 +21,6 @@ import reborncore.common.util.Color; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.RockCutterCharge; diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index e754eaedb..186e704fc 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -8,7 +8,6 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.items.ItemTR; -import techreborn.items.ItemTextureBase; public class ItemTechManual extends ItemTR implements ITexturedItem { diff --git a/src/main/java/techreborn/manual/GuiManual.java b/src/main/java/techreborn/manual/GuiManual.java index 9c18b2f13..88320c017 100644 --- a/src/main/java/techreborn/manual/GuiManual.java +++ b/src/main/java/techreborn/manual/GuiManual.java @@ -10,11 +10,21 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import techreborn.init.ModBlocks; +import techreborn.init.ModItems; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; +import techreborn.manual.pages.AdvancedMachines; +import techreborn.manual.pages.BasicMachinesPage; import techreborn.manual.pages.ContentsPage; +import techreborn.manual.pages.CraftingInfoPage; import techreborn.manual.pages.DescriptionPage; +import techreborn.manual.pages.GeneratingPowerPage; import techreborn.manual.pages.GettingStartedPage; +import techreborn.manual.pages.ToolsPage; @SideOnly(Side.CLIENT) public class GuiManual extends GuiScreen @@ -38,11 +48,51 @@ public class GuiManual extends GuiScreen { pageIndex = 0; final PageCollection pageCollection = new PageCollection(); - pageCollection.addPage(new ContentsPage("CONTENTS", pageCollection)); + pageCollection.addPage(new ContentsPage(Reference.pageNames.CONTENTS_PAGE, pageCollection)); + + //GETTING STARTED pageCollection.addPage(new GettingStartedPage(Reference.pageNames.GETTINGSTARTED_PAGE, pageCollection)); - pageCollection.addPage(new DescriptionPage(Reference.pageNames.GETTINGRUBBER_PAGE, pageCollection, true)); + + pageCollection.addPage(new DescriptionPage(Reference.pageNames.GETTINGRUBBER_PAGE, pageCollection, true, Reference.pageNames.GETTINGRUBBER2_PAGE)); + pageCollection.addPage(new CraftingInfoPage(Reference.pageNames.GETTINGRUBBER2_PAGE, pageCollection, ItemParts.getPartByName("rubber"), "", Reference.pageNames.GETTINGRUBBER_PAGE)); + pageCollection.addPage(new CraftingInfoPage(Reference.pageNames.CRAFTINGPLATES_PAGE, pageCollection, ItemPlates.getPlateByName("iron"), "", Reference.pageNames.GETTINGSTARTED_PAGE)); + //POWER GENERATION + pageCollection.addPage(new GeneratingPowerPage(Reference.pageNames.GENERATINGPOWER_PAGE, pageCollection)); + + pageCollection.addPage(new CraftingInfoPage(ModBlocks.Generator.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.Generator), "", Reference.pageNames.GENERATINGPOWER_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.thermalGenerator.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.thermalGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.solarPanel.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.solarPanel), "", Reference.pageNames.GENERATINGPOWER_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.heatGenerator.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.heatGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.LightningRod.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.LightningRod), "", Reference.pageNames.GENERATINGPOWER_PAGE)); + //BASIC MACHINES + pageCollection.addPage(new BasicMachinesPage(Reference.pageNames.BASICMACHINES_PAGE, pageCollection)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.Grinder.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.Grinder), "", Reference.pageNames.BASICMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.ElectricFurnace.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.ElectricFurnace), "", Reference.pageNames.BASICMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.AlloySmelter.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.AlloySmelter), "", Reference.pageNames.BASICMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.Extractor.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.Extractor), "", Reference.pageNames.BASICMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.Compressor.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.Compressor), "", Reference.pageNames.BASICMACHINES_PAGE)); + + //ADVANCED MACHINES + pageCollection.addPage(new AdvancedMachines(Reference.pageNames.ADVANCEDMACHINES_PAGE, pageCollection)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.BlastFurnace.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.BlastFurnace), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialSawmill.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.industrialSawmill), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.IndustrialElectrolyzer.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.IndustrialElectrolyzer), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.IndustrialGrinder.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.IndustrialGrinder), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.ImplosionCompressor.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.ImplosionCompressor), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModBlocks.centrifuge.getLocalizedName(), pageCollection, new ItemStack(ModBlocks.centrifuge), "", Reference.pageNames.ADVANCEDMACHINES_PAGE)); + + //TOOLS + pageCollection.addPage(new ToolsPage(Reference.pageNames.TOOLS_PAGE, pageCollection)); + pageCollection.addPage(new CraftingInfoPage(ModItems.ironDrill.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.ironDrill), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.diamondDrill.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.diamondDrill), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.advancedDrill.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.advancedDrill), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.ironChainsaw.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.ironChainsaw), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.diamondChainsaw.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.diamondChainsaw), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.advancedChainsaw.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.advancedChainsaw), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.omniTool.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.omniTool), "", Reference.pageNames.TOOLS_PAGE)); + pageCollection.addPage(new CraftingInfoPage(ModItems.treeTap.getUnlocalizedName() + ".name", pageCollection, new ItemStack(ModItems.treeTap), "", Reference.pageNames.TOOLS_PAGE)); return pageCollection; } diff --git a/src/main/java/techreborn/manual/PageCollection.java b/src/main/java/techreborn/manual/PageCollection.java index e6e4bacee..bf3edc9dc 100644 --- a/src/main/java/techreborn/manual/PageCollection.java +++ b/src/main/java/techreborn/manual/PageCollection.java @@ -13,7 +13,7 @@ import techreborn.manual.pages.BasePage; public class PageCollection extends Gui { public final List pages = Lists.newArrayList(); - private String ACTIVE_PAGE = "CONTENTS"; + private String ACTIVE_PAGE = Reference.pageNames.CONTENTS_PAGE; protected int x; protected int y; diff --git a/src/main/java/techreborn/manual/Reference.java b/src/main/java/techreborn/manual/Reference.java index ee9c7f18a..55555a060 100644 --- a/src/main/java/techreborn/manual/Reference.java +++ b/src/main/java/techreborn/manual/Reference.java @@ -4,11 +4,26 @@ public class Reference { public static final String CONTENTS_KEY = "techreborn.manual.contents"; public static final String GETTINGSTARTED_KEY = "techreborn.manual.gettingstarted"; + public static final String GENERATINGPOWER_KEY = "techreborn.manual.generatingpower"; + public static final String BASICMACHINES_KEY = "techreborn.manual.basicmachines"; + public static final String ADVANCEDMACHINES_KEY = "techreborn.manual.advancedmachines"; + public static final String TOOLS_KEY = "techreborn.manual.tools"; + public static final String GETTINGRUBBER_KEY = "techreborn.manual.gettingrubber"; + public static final String CRAFTINGPLATES_KEY = "techreborn.manual.gettingplates"; + public class pageNames { + public static final String CONTENTS_PAGE = "contents"; + public static final String BASICMACHINES_PAGE = "basicmachines"; + public static final String GETTINGSTARTED_PAGE = "gettingstarted"; public static final String GETTINGRUBBER_PAGE = "gettingrubber"; + public static final String GETTINGRUBBER2_PAGE = "gettingrubber2"; + public static final String CRAFTINGPLATES_PAGE = "gettingplates"; + public static final String GENERATINGPOWER_PAGE = "generatingpower"; + public static final String ADVANCEDMACHINES_PAGE = "advancedmachines"; + public static final String TOOLS_PAGE = "tools"; } } diff --git a/src/main/java/techreborn/manual/old/ContentsPageOld.java b/src/main/java/techreborn/manual/old/ContentsPageOld.java deleted file mode 100644 index 02a2f5b1e..000000000 --- a/src/main/java/techreborn/manual/old/ContentsPageOld.java +++ /dev/null @@ -1,57 +0,0 @@ -package techreborn.manual.old; - -import java.awt.Color; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.item.ItemStack; -import techreborn.config.TechRebornConfigGui; -import techreborn.init.ModBlocks; -import techreborn.init.ModItems; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.TitledPage; -import techreborn.manual.util.GuiButtonCustomTexture; - -public class ContentsPageOld extends TitledPage { - - public ContentsPageOld(String name, PageCollection collection) { - super(name, false, collection, "techreborn.pda.contents", Color.white.getRGB()); - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() { - buttonList.clear(); - buttonList.add(new GuiButtonCustomTexture(0, getXMin() + 25, getYMin() + 20, 0, 46, 80, 20, new ItemStack(ModBlocks.AlloySmelter), "INDEX", "MACHINES")); - buttonList.add(new GuiButtonCustomTexture(1, getXMin() + 160, getYMin() + 20, 0, 46, 80, 20, new ItemStack(ModItems.uuMatter), "INDEX", "ITEMS")); - buttonList.add(new GuiButtonCustomTexture(2, getXMin() + 25, getYMin() + 40, 0, 46, 80, 20, new ItemStack(ModBlocks.DieselGenerator), "INDEX", "POWER GENERATION")); - buttonList.add(new GuiButtonCustomTexture(3, getXMin() + 160, getYMin() + 40, 0, 46, 80, 20, new ItemStack(ModItems.advancedDrill), "INDEX", "TOOLS")); - buttonList.add(new GuiButtonCustomTexture(4, getXMin() + 25, getYMin() + 60, 0, 46, 80, 20, new ItemStack(ModBlocks.Aesu), "INDEX", "POWER STORAGE")); - buttonList.add(new GuiButtonCustomTexture(5, getXMin() + 25, getYMin() + 80, 0, 46, 80, 20, new ItemStack(ModBlocks.MachineCasing), "INDEX", "MULTIBLOCKS")); - buttonList.add(new GuiButtonCustomTexture(6, getXMin() + 160, getYMin() + 60, 0, 46, 80, 20, new ItemStack(ModItems.upgrades), "INDEX", "UPGRADES")); - - buttonList.add(new GuiButtonCustomTexture(7, getXMin() + 160, getYMin() + 180, 0, 46, 80, 20, new ItemStack(ModItems.lapotronicOrb), "INDEX", "Changelog")); - buttonList.add(new GuiButtonCustomTexture(8, getXMin() + 25, getYMin() + 180, 0, 46, 80, 20, new ItemStack(ModItems.lapotronicOrb), "INDEX", "Configs")); - } - - @Override - public void renderBackgroundLayer(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderBackgroundLayer(minecraft, offsetX, offsetY, mouseX, mouseY); - } - - @Override - public void actionPerformed(GuiButton button) { - if (button.id == 0) collection.changeActivePage("MACHINES"); - if (button.id == 1) collection.changeActivePage("ITEMS"); - if (button.id == 2) collection.changeActivePage("POWER_GENERATION"); - if (button.id == 3) collection.changeActivePage("TOOLS"); - if (button.id == 4) collection.changeActivePage("POWER_STORAGE"); - if (button.id == 5) collection.changeActivePage("MULTIBLOCKS"); - if (button.id == 6) collection.changeActivePage("UPGRADES"); - if (button.id == 7) collection.changeActivePage("VERSION"); - if (button.id == 8) mc.displayGuiScreen(new TechRebornConfigGui(this)); - - if (button.id == 9) collection.changeActivePage("CONFIG"); - - } -} diff --git a/src/main/java/techreborn/manual/old/GuiManualOld.java b/src/main/java/techreborn/manual/old/GuiManualOld.java deleted file mode 100644 index 20a7b6908..000000000 --- a/src/main/java/techreborn/manual/old/GuiManualOld.java +++ /dev/null @@ -1,176 +0,0 @@ -package techreborn.manual.old; - -import java.io.IOException; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.ModBlocks; -import techreborn.init.ModItems; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.ContentsPage; - -@SideOnly(Side.CLIENT) -public class GuiManualOld extends GuiScreen { - - protected final PageCollection root; - protected int pageIndex = 0; - protected int xSize = 0; - protected int ySize = 0; - public Container inventorySlots; - protected int guiLeft; - protected int guiTop; - - public GuiManualOld() { - this.xSize = 256; - this.ySize = 202; - root = createRoot(); - } - - protected PageCollection createRoot() { - pageIndex = 0; - final PageCollection pageCollection = new PageCollection(); - pageCollection.addPage(new IndexPage("INDEX", pageCollection)); - pageCollection.addPage(new ContentsPage("CONTENTS", pageCollection)); - pageCollection.addPage(new ItemsPage("ITEMS", pageCollection, "ITEM_PAGE")); - pageCollection.addPage(new ItemsPage("TOOLS", pageCollection, "TOOLS_PAGE")); - pageCollection.addPage(new ItemsPage("UPGRADES", pageCollection, "UPGRADES_PAGE")); - - pageCollection.addPage(new ItemsPage("MACHINES", pageCollection, "MACHINES_PAGE")); - pageCollection.addPage(new ItemsPage("POWER_GENERATION", pageCollection, "POWER_GENERATION_PAGE")); - pageCollection.addPage(new ItemsPage("POWER_STORAGE", pageCollection, "POWER_STORAGE_PAGE")); - pageCollection.addPage(new VersionPage("VERSION", pageCollection, "VERSION PAGE", 777777)); - pageCollection.addPage(new MultiBlockPage("MULTIBLOCKS", pageCollection, "MULTIBLOCK_PAGE")); - - pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Aesu), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.AlloyFurnace), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.AlloySmelter), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.BlastFurnace), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.centrifuge), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.chargeBench), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ChemicalReactor), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ChunkLoader), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ComputerCube), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.DieselGenerator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.digitalChest), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Distillationtower), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Dragoneggenergysiphoner), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ElectricCraftingTable), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.FusionCoil), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.FusionControlComputer), "")); - pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Gasturbine), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.IndustrialGrinder), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.heatGenerator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.HighAdvancedMachineBlock), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Idsu), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ImplosionCompressor), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.IndustrialElectrolyzer), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Lesu), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.LesuStorage), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.LightningRod), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.machineframe), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.MagicalAbsorber), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Magicenergeyconverter), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.MatterFabricator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.PlasmaGenerator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.quantumChest), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.quantumTank), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.RollingMachine), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Semifluidgenerator), "")); - pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.thermalGenerator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.VacuumFreezer), "")); - - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.advancedDrill), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.cloakingDevice), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.lapotronicOrb), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.lapotronpack), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.lithiumBatpack), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.omniTool), "")); - pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.rockCutter), "")); - pageCollection.addPage(new CraftingInfoPage("ITEM_PAGE." + getNextPageIndex(), pageCollection, new ItemStack(ModItems.uuMatter), "")); - - return pageCollection; - } - - private int getNextPageIndex() { - int i = pageIndex; - pageIndex++; - return i; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float par3) { - drawGuiBackgroundLayer(par3, mouseX, mouseY); - super.drawScreen(mouseX, mouseY, par3); - - prepareRenderState(); - GL11.glPushMatrix(); - - root.drawScreen(this.mc, this.guiLeft, this.guiTop, mouseX - this.guiLeft, mouseY - this.guiTop); - - GL11.glPopMatrix(); - restoreRenderState(); - } - - protected void prepareRenderState() { - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - } - - protected void restoreRenderState() { - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableStandardItemLighting(); - } - - protected void drawGuiBackgroundLayer(float p_146976_1_, int mouseX, int mouseY) { - GL11.glPushMatrix(); - GL11.glTranslated(this.guiLeft, this.guiTop, 0); - root.renderBackgroundLayer(this.mc, 0, 0, mouseX - this.guiLeft, mouseY - this.guiTop); - GL11.glPopMatrix(); - } - - @Override - public void setWorldAndResolution(Minecraft minecraft, int x, int y) { - super.setWorldAndResolution(minecraft, x, y); - root.setWorldAndResolution(minecraft, x, y); - } - -// @Override -// public void actionPerformed(GuiButton button) { -// root.actionPerformed(button); -// } -// -// -// @Override -// public void mouseClicked(int par1, int par2, int par3) throws IOException { -// root.mouseClicked(par1, par2, par3); -// } - - @Override - public void handleInput() throws IOException { - super.handleInput(); - } - - @Override - public void initGui() { - super.initGui(); - this.guiLeft = (this.width - this.xSize) / 2; - this.guiTop = (this.height - this.ySize) / 2; - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } -} diff --git a/src/main/java/techreborn/manual/old/IndexPage.java b/src/main/java/techreborn/manual/old/IndexPage.java deleted file mode 100644 index 71fd0c3dd..000000000 --- a/src/main/java/techreborn/manual/old/IndexPage.java +++ /dev/null @@ -1,62 +0,0 @@ -package techreborn.manual.old; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.BasePage; -import techreborn.manual.pages.TitledPage; -import techreborn.manual.util.GuiButtonTextOnly; - -public class IndexPage extends TitledPage { - - public IndexPage(String name, PageCollection collection) { - super(name, false, collection, "techreborn.pda.index", 518915); - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() { - buttonList.clear(); - int row = 0; - int collum = 0; - for (BasePage page : collection.pages) { - if (page.hasIndexButton) { - String indexName = page.INDEX_NAME; - if (indexName == null && page instanceof CraftingInfoPage) - indexName = ttl(((CraftingInfoPage) page).result.getUnlocalizedName() + ".name"); - else if (indexName == null) indexName = page.getReferenceName(); - int colour = 0000000; - - buttonList.add(new GuiButtonTextOnly(999, getXMin() + 5 + collum * 81, getYMin() + 20 + (row * 7), 82, 7, indexName, page.getReferenceName(), 6666666)); - row++; - if (row > 21) { - row = 0; - collum++; - } - } - } - } - - @Override - public void actionPerformed(GuiButton button) { - if (button instanceof GuiButtonTextOnly) - collection.changeActivePage(((GuiButtonTextOnly) button).LINKED_PAGE); - if (button.id == 0) collection.changeActivePage("CONTENTS"); - } - - @Override - public void renderBackgroundLayer(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderBackgroundLayer(minecraft, offsetX, offsetY, mouseX, mouseY); - } - - @Override - public void drawScreen(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.drawScreen(minecraft, offsetX, offsetY, mouseX, mouseY); - for (int k = 0; k < this.buttonList.size(); ++k) { - if (buttonList.get(k) instanceof GuiButtonTextOnly && ((GuiButtonTextOnly) buttonList.get(k)).getIsHovering()) { - ((GuiButtonTextOnly) this.buttonList.get(k)).drawButton(this.mc, mouseX + offsetX, mouseY + offsetY); - } - } - buttonList.add(new GuiButton(0, offsetX + 20, offsetY + 180, ttl("techreborn.pda.backbutton"))); - } -} diff --git a/src/main/java/techreborn/manual/old/ItemsPage.java b/src/main/java/techreborn/manual/old/ItemsPage.java deleted file mode 100644 index 1a9ef122b..000000000 --- a/src/main/java/techreborn/manual/old/ItemsPage.java +++ /dev/null @@ -1,67 +0,0 @@ -package techreborn.manual.old; - -import java.awt.Color; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.BasePage; -import techreborn.manual.pages.TitledPage; -import techreborn.manual.util.GuiButtonTextOnly; - -public class ItemsPage extends TitledPage { - public String PAGE; - - public ItemsPage(String name, PageCollection collection, String page) { - super(name, false, collection, page, Color.white.getRGB()); - PAGE = page; - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() { - buttonList.clear(); - int row = 0; - int collum = 0; - for (BasePage page : collection.pages) { - if (page.hasIndexButton) { - String indexName = page.INDEX_NAME; - if (page.getReferenceName() != null && page.getReferenceName().contains(PAGE)) { - if (indexName == null && page instanceof CraftingInfoPage) - indexName = ttl(((CraftingInfoPage) page).result.getUnlocalizedName() + ".name"); - else if (indexName == null) indexName = page.getReferenceName(); - int colour = 77777777; - buttonList.add(new GuiButtonTextOnly(999, getXMin() + 20 + collum * 120, getYMin() + 20 + (row * 7), 82, 7, indexName, page.getReferenceName(), 6666666)); - row++; - if (row > 21) { - row = 0; - collum++; - } - } - } - } - buttonList.add(new GuiButton(1, getXMin() + 20, getYMin() + 180, ttl("techreborn.pda.backbutton"))); - } - - @Override - public void actionPerformed(GuiButton button) { - if (button instanceof GuiButtonTextOnly) - collection.changeActivePage(((GuiButtonTextOnly) button).LINKED_PAGE); - if (button.id == 1) collection.changeActivePage("CONTENTS"); - } - - @Override - public void renderBackgroundLayer(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderBackgroundLayer(minecraft, offsetX, offsetY, mouseX, mouseY); - } - - @Override - public void drawScreen(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.drawScreen(minecraft, offsetX, offsetY, mouseX, mouseY); - for (int k = 0; k < this.buttonList.size(); ++k) { - if (buttonList.get(k) instanceof GuiButtonTextOnly && ((GuiButtonTextOnly) buttonList.get(k)).getIsHovering()) { - ((GuiButtonTextOnly) this.buttonList.get(k)).drawButton(this.mc, mouseX + offsetX, mouseY + offsetY); - } - } - } -} diff --git a/src/main/java/techreborn/manual/old/MultiBlockPage.java b/src/main/java/techreborn/manual/old/MultiBlockPage.java deleted file mode 100644 index a80218f49..000000000 --- a/src/main/java/techreborn/manual/old/MultiBlockPage.java +++ /dev/null @@ -1,98 +0,0 @@ -package techreborn.manual.old; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.ResourceLocation; -import reborncore.client.multiblock.Multiblock; -import reborncore.client.multiblock.MultiblockSet; -import techreborn.init.ModBlocks; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.TitledPage; -import techreborn.proxies.ClientProxy; - -import java.awt.*; - -public class MultiBlockPage extends TitledPage { - - public static ResourceLocation test = new ResourceLocation("techreborn:textures/pda/multiblocks/base.png"); - - public MultiBlockPage(String name, PageCollection collection, String unlocalizedTitle) { - super(name, false, collection, unlocalizedTitle, Color.white.getRGB()); - } - - @Override - public void initGui() { - super.initGui(); - GuiButton button = new GuiButton(212, getXMin() + 30, getYMin() + 140, "Show multiblock in world"); - buttonList.add(button); - if (ClientProxy.multiblockRenderEvent.currentMultiblock != null) { - button.displayString = "Hide multiblock in world"; - } - } - - @Override - public void drawBackground(int p_146278_1_) { - super.drawBackground(p_146278_1_); - } - - @Override - public void renderOverlayComponents(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderOverlayComponents(minecraft, offsetX, offsetY, mouseX, mouseY); - drawCenteredString(fontRendererObj, ttl("techreborn.pda.multiblock.decripion"), offsetX + 128, offsetY + 20, Color.white.getRGB()); - } - - @Override - public void actionPerformed(GuiButton button) { - super.actionPerformed(button); - if (button.id == 212) { - if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { - {//This code here makes a basic multiblock and then sets to the selected one. - Multiblock multiblock = new Multiblock(); - multiblock.addComponent(0, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 0, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, 1, ModBlocks.MachineCasing, 0); - - multiblock.addComponent(1, 1, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 1, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 1, 1, ModBlocks.MachineCasing, 0); - - multiblock.addComponent(1, 2, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 2, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0); - - multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 3, 1, ModBlocks.MachineCasing, 0); - - MultiblockSet set = new MultiblockSet(multiblock); - ClientProxy.multiblockRenderEvent.setMultiblock(set); - } - button.displayString = "Hide multiblock in world"; - } else { - ClientProxy.multiblockRenderEvent.setMultiblock(null); - button.displayString = "Show multiblock in world"; - } - } - } -} diff --git a/src/main/java/techreborn/manual/old/VersionPage.java b/src/main/java/techreborn/manual/old/VersionPage.java deleted file mode 100644 index 6424f67ea..000000000 --- a/src/main/java/techreborn/manual/old/VersionPage.java +++ /dev/null @@ -1,63 +0,0 @@ -package techreborn.manual.old; - -import net.minecraft.client.Minecraft; -import org.lwjgl.opengl.GL11; -import techreborn.Core; -import techreborn.lib.ModInfo; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.TitledPage; - -import java.awt.*; -import java.util.ArrayList; - -public class VersionPage extends TitledPage { - - public VersionPage(String name, PageCollection collection, String unlocalizedTitle, int colour) { - super(name, false, collection, unlocalizedTitle, Color.white.getRGB()); - } - - @Override - public void initGui() { - super.initGui(); - } - - @Override - public void renderOverlayComponents(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderOverlayComponents(minecraft, offsetX, offsetY, mouseX, mouseY); - addDescription(mc, offsetX, offsetY); - addChangelog(mc, offsetX, offsetY); - addChangelog2(mc, offsetX, offsetY); - } - - @Override - public void renderBackgroundLayer(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - super.renderBackgroundLayer(minecraft, offsetX, offsetY, mouseX, mouseY); - } - - public void addDescription(Minecraft minecraft, int offsetX, int offsetY) { - GL11.glPushMatrix(); - this.drawCenteredString(minecraft.fontRendererObj, "INSTALLED VERSION " + ModInfo.MOD_VERSION, offsetX + 120, offsetY + 20, 7777777); - this.drawCenteredString(minecraft.fontRendererObj, "LATEST VERSION " + "TODO", offsetX + 120, offsetY + 40, 7777777); - GL11.glPopMatrix(); - } - - public void addChangelog(Minecraft minecraft, int offsetX, int offsetY) { - GL11.glPushMatrix(); - this.drawCenteredString(minecraft.fontRendererObj, "CHANGELOG", offsetX + 120, getYMin() + 50, 7777777); - GL11.glPopMatrix(); - } - - public void addChangelog2(Minecraft minecraft, int offsetX, int offsetY) { - ArrayList changeLog = Core.INSTANCE.versionChecker.getChangeLogSinceCurrentVersion(); - - GL11.glPushMatrix(); - GL11.glScalef(0.7F, 0.7F, 0.7F); - - int y = offsetY + 105; - for (String change : changeLog) { - drawCenteredString(minecraft.fontRendererObj, change, offsetX + 230, y, Color.white.getRGB()); - y += 10; - } - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/techreborn/manual/pages/AdvancedMachines.java b/src/main/java/techreborn/manual/pages/AdvancedMachines.java new file mode 100644 index 000000000..b6c716a39 --- /dev/null +++ b/src/main/java/techreborn/manual/pages/AdvancedMachines.java @@ -0,0 +1,50 @@ +package techreborn.manual.pages; + +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import techreborn.init.ModBlocks; +import techreborn.manual.PageCollection; +import techreborn.manual.Reference; +import techreborn.manual.util.ButtonUtil; +import techreborn.manual.util.GuiButtonItemTexture; + +public class AdvancedMachines extends TitledPage +{ + public AdvancedMachines(String name, PageCollection collection) + { + super(name, false, collection, Reference.ADVANCEDMACHINES_KEY, Color.white.getRGB()); + } + + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(1, getXMin() + 10, getYMin() + 20, 0, 46, 100, 20, new ItemStack(ModBlocks.BlastFurnace), + ModBlocks.BlastFurnace.getUnlocalizedName(), ttl(ModBlocks.BlastFurnace.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 10, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModBlocks.industrialSawmill), + ModBlocks.industrialSawmill.getUnlocalizedName(), ttl(ModBlocks.industrialSawmill.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(3, getXMin() + 10, getYMin() + 60, 0, 46, 100, 20, new ItemStack(ModBlocks.IndustrialElectrolyzer), + ModBlocks.IndustrialElectrolyzer.getUnlocalizedName(), ttl(ModBlocks.IndustrialElectrolyzer.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(4, getXMin() + 10, getYMin() + 80, 0, 46, 100, 20, new ItemStack(ModBlocks.IndustrialGrinder), + ModBlocks.IndustrialGrinder.getUnlocalizedName(), ttl(ModBlocks.IndustrialGrinder.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(5, getXMin() + 10, getYMin() + 100, 0, 46, 100, 20, new ItemStack(ModBlocks.ImplosionCompressor), + ModBlocks.ImplosionCompressor.getUnlocalizedName(), ttl(ModBlocks.ImplosionCompressor.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(6, getXMin() + 10, getYMin() + 120, 0, 46, 100, 20, new ItemStack(ModBlocks.centrifuge), + ModBlocks.centrifuge.getUnlocalizedName(), ttl(ModBlocks.centrifuge.getLocalizedName()))); + } + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); + if (button.id == 1) collection.changeActivePage(ModBlocks.BlastFurnace.getLocalizedName()); + if (button.id == 2) collection.changeActivePage(ModBlocks.industrialSawmill.getLocalizedName()); + if (button.id == 3) collection.changeActivePage(ModBlocks.IndustrialElectrolyzer.getLocalizedName()); + if (button.id == 4) collection.changeActivePage(ModBlocks.IndustrialGrinder.getLocalizedName()); + if (button.id == 5) collection.changeActivePage(ModBlocks.ImplosionCompressor.getLocalizedName()); + if (button.id == 6) collection.changeActivePage(ModBlocks.centrifuge.getLocalizedName()); + } +} diff --git a/src/main/java/techreborn/manual/pages/BasePage.java b/src/main/java/techreborn/manual/pages/BasePage.java index d497bc2d0..5b9ef56c9 100644 --- a/src/main/java/techreborn/manual/pages/BasePage.java +++ b/src/main/java/techreborn/manual/pages/BasePage.java @@ -1,13 +1,14 @@ package techreborn.manual.pages; +import java.io.IOException; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.manual.PageCollection; - -import java.io.IOException; +import techreborn.manual.Reference; public class BasePage extends GuiScreen { @@ -58,13 +59,6 @@ public class BasePage extends GuiScreen { return this; } - @SuppressWarnings("unchecked") - @Override - public void initGui() { - buttonList.clear(); - buttonList.add(new GuiButton(0, getXMin() + 30, getYMin() + 150, 80, 16, ttl("techreborn.manual.backbutton"))); - } - public void setReferenceName(String name) { REFERENCE_NAME = name; } @@ -88,7 +82,7 @@ public class BasePage extends GuiScreen { @Override public void actionPerformed(GuiButton button) { - if (button.id == 0) collection.changeActivePage("CONTENTS"); + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); } @Override diff --git a/src/main/java/techreborn/manual/pages/BasicMachinesPage.java b/src/main/java/techreborn/manual/pages/BasicMachinesPage.java new file mode 100644 index 000000000..bf45f2b90 --- /dev/null +++ b/src/main/java/techreborn/manual/pages/BasicMachinesPage.java @@ -0,0 +1,47 @@ +package techreborn.manual.pages; + +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import techreborn.init.ModBlocks; +import techreborn.manual.PageCollection; +import techreborn.manual.Reference; +import techreborn.manual.util.ButtonUtil; +import techreborn.manual.util.GuiButtonItemTexture; + +public class BasicMachinesPage extends TitledPage +{ + public BasicMachinesPage(String name, PageCollection collection) + { + super(name, false, collection, Reference.BASICMACHINES_KEY, Color.white.getRGB()); + } + + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, new ItemStack(ModBlocks.Grinder), + ModBlocks.Grinder.getUnlocalizedName(), ttl(ModBlocks.Grinder.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModBlocks.ElectricFurnace), + ModBlocks.ElectricFurnace.getUnlocalizedName(), ttl(ModBlocks.ElectricFurnace.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20, new ItemStack(ModBlocks.AlloySmelter), + ModBlocks.AlloySmelter.getUnlocalizedName(), ttl(ModBlocks.AlloySmelter.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20, new ItemStack(ModBlocks.Extractor), + ModBlocks.Extractor.getUnlocalizedName(), ttl(ModBlocks.Extractor.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20, new ItemStack(ModBlocks.Compressor), + ModBlocks.Compressor.getUnlocalizedName(), ttl(ModBlocks.Compressor.getLocalizedName()))); + } + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); + if (button.id == 1) collection.changeActivePage(ModBlocks.Grinder.getLocalizedName()); + if (button.id == 2) collection.changeActivePage(ModBlocks.ElectricFurnace.getLocalizedName()); + if (button.id == 3) collection.changeActivePage(ModBlocks.AlloySmelter.getLocalizedName()); + if (button.id == 4) collection.changeActivePage(ModBlocks.Extractor.getLocalizedName()); + if (button.id == 5) collection.changeActivePage(ModBlocks.Compressor.getLocalizedName()); + } +} diff --git a/src/main/java/techreborn/manual/pages/ContentsPage.java b/src/main/java/techreborn/manual/pages/ContentsPage.java index 0c56c913b..300a6d24e 100644 --- a/src/main/java/techreborn/manual/pages/ContentsPage.java +++ b/src/main/java/techreborn/manual/pages/ContentsPage.java @@ -5,13 +5,12 @@ import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; -import techreborn.config.TechRebornConfigGui; import techreborn.init.ModBlocks; import techreborn.init.ModItems; import techreborn.items.ItemPlates; import techreborn.manual.PageCollection; import techreborn.manual.Reference; -import techreborn.manual.util.GuiButtonCustomTexture; +import techreborn.manual.util.GuiButtonItemTexture; public class ContentsPage extends TitledPage { @@ -25,8 +24,16 @@ public class ContentsPage extends TitledPage public void initGui() { buttonList.clear(); - buttonList.add(new GuiButtonCustomTexture(0, getXMin() + 25, getYMin() + 20, 0, 46, 100, 20, ItemPlates.getPlateByName("iron"), + buttonList.add(new GuiButtonItemTexture(0, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, ItemPlates.getPlateByName("iron"), Reference.pageNames.GETTINGSTARTED_PAGE, ttl(Reference.GETTINGSTARTED_KEY))); + buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModBlocks.Generator), + Reference.pageNames.GENERATINGPOWER_PAGE, ttl(Reference.GENERATINGPOWER_KEY))); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20, new ItemStack(ModBlocks.ElectricFurnace), + Reference.pageNames.BASICMACHINES_PAGE, ttl(Reference.BASICMACHINES_KEY))); + buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20, new ItemStack(ModBlocks.BlastFurnace), + Reference.pageNames.ADVANCEDMACHINES_PAGE, ttl(Reference.ADVANCEDMACHINES_KEY))); + buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20, new ItemStack(ModItems.ironDrill), + Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY))); } @Override @@ -39,5 +46,9 @@ public class ContentsPage extends TitledPage public void actionPerformed(GuiButton button) { if (button.id == 0) collection.changeActivePage(Reference.pageNames.GETTINGSTARTED_PAGE); + if (button.id == 1) collection.changeActivePage(Reference.pageNames.GENERATINGPOWER_PAGE); + if (button.id == 2) collection.changeActivePage(Reference.pageNames.BASICMACHINES_PAGE); + if (button.id == 3) collection.changeActivePage(Reference.pageNames.ADVANCEDMACHINES_PAGE); + if (button.id == 4) collection.changeActivePage(Reference.pageNames.TOOLS_PAGE); } } diff --git a/src/main/java/techreborn/manual/old/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java similarity index 76% rename from src/main/java/techreborn/manual/old/CraftingInfoPage.java rename to src/main/java/techreborn/manual/pages/CraftingInfoPage.java index f229c1409..aa9244dda 100644 --- a/src/main/java/techreborn/manual/old/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -1,32 +1,41 @@ -package techreborn.manual.old; +package techreborn.manual.pages; -import com.google.common.base.Objects; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.*; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import techreborn.manual.PageCollection; -import techreborn.manual.pages.TitledPage; - -import org.lwjgl.opengl.GL11; - -import java.awt.*; +import java.awt.Color; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; -public class CraftingInfoPage extends TitledPage { +import org.lwjgl.opengl.GL11; + +import com.google.common.base.Objects; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import techreborn.manual.PageCollection; +import techreborn.manual.util.ButtonUtil; + +public class CraftingInfoPage extends TitledPage +{ public ItemStack result; private boolean isSmelting = false; private ItemStack[] recipe = new ItemStack[9]; @@ -34,51 +43,70 @@ public class CraftingInfoPage extends TitledPage { private String rawDescription; private List formattedDescription; private float descriptionScale = 0.66f; + public String imageprefix = "techreborn:textures/manual/elements/"; + public String backpage; - public CraftingInfoPage(String name, PageCollection collection, ItemStack itemStack, String unlocalizedDescription) { + + public CraftingInfoPage(String name, PageCollection collection, ItemStack itemStack, String unlocalizedDescription, String backPage) + { super(name, true, collection, itemStack.getUnlocalizedName() + ".name", Color.white.getRGB()); this.result = itemStack; this.recipe = getFirstRecipeForItem(itemStack); + this.backpage = backPage; for (ItemStack stack : recipe) if (stack != null) hasRecipe = true; if (unlocalizedDescription == "") rawDescription = ttl(itemStack.getUnlocalizedName() + ".description"); else rawDescription = ttl(unlocalizedDescription); } + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + } + @Override public void renderBackgroundLayer(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { super.renderBackgroundLayer(minecraft, offsetX, offsetY, mouseX, mouseY); GL11.glPushMatrix(); - if (isSmelting) { - drawTexturedModalRect(offsetX + 87, offsetY + 15, 116, 202, 82, 54); - } else { - if (hasRecipe) { - drawTexturedModalRect(offsetX + 70, offsetY + 15, 0, 202, 116, 54); - } else { - drawTexturedModalRect(offsetX + 119, offsetY + 17, 0, 202, 18, 18); - drawString(fontRendererObj, "No Crafting Recipe", offsetX + 145, offsetY + 17, Color.white.getRGB()); + if (isSmelting) + { + renderImage(offsetX + 15, offsetY + 10, "furnacerecipe"); + } + else + { + if (hasRecipe) + { + renderImage(offsetX, offsetY + 10, "craftingtable"); + } + else + { + drawString(fontRendererObj, "No Crafting Recipe", offsetX + 40, offsetY + 22, Color.black.getRGB()); } } GL11.glPopMatrix(); } - public void drawScreen(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { + public void drawScreen(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) + { super.drawScreen(minecraft, offsetX, offsetY, mouseX, mouseY); int relativeMouseX = mouseX + offsetX; int relativeMouseY = mouseY + offsetY; - int gridOffsetX = isSmelting ? 88 : 71; - int gridOffsetY = 16; + int gridOffsetX = isSmelting ? 85 : 71; + int gridOffsetY = 18; int itemBoxSize = 18; - addDescription(minecraft, offsetX, offsetY); + addDescription(minecraft, offsetX + 8, offsetY); ItemStack tooltip = null; int i = 0; - for (ItemStack input : recipe) { + for (ItemStack input : recipe) + { if (input != null) { int row = (i % 3); int column = i / 3; - int itemX = offsetX + gridOffsetX + (row * itemBoxSize); - int itemY = offsetY + gridOffsetY + (column * itemBoxSize); + int itemX = offsetX + gridOffsetX + (row * itemBoxSize) - 54; + int itemY = offsetY + gridOffsetY + (column * itemBoxSize) + 2; drawItemStack(input, itemX, itemY, ""); if (relativeMouseX > itemX - 2 && relativeMouseX < itemX - 2 + itemBoxSize && relativeMouseY > itemY - 2 && relativeMouseY < itemY - 2 + itemBoxSize) { @@ -87,10 +115,10 @@ public class CraftingInfoPage extends TitledPage { } i++; } - int itemX = offsetX + (isSmelting ? 148 : 165); - int itemY = offsetY + 34; + int itemX = offsetX + (isSmelting ? 92 : 112); + int itemY = offsetY + (isSmelting ? 40 : 38); if (!hasRecipe) { - itemX = offsetX + 120; + itemX = offsetX + 20; itemY = offsetY + 18; } @@ -103,8 +131,21 @@ public class CraftingInfoPage extends TitledPage { drawItemStackTooltip(tooltip, relativeMouseX, relativeMouseY); } } + + public void renderImage(int offsetX, int offsetY, String imagename) + { + TextureManager render = Minecraft.getMinecraft().renderEngine; + render.bindTexture(new ResourceLocation(imageprefix + imagename + ".png")); - public void addDescription(Minecraft minecraft, int offsetX, int offsetY) { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1F, 1F, 1F, 1F); + drawTexturedModalRect(offsetX, offsetY - 14, 0, 0, 140, this.height); + GL11.glDisable(GL11.GL_BLEND); + } + + public void addDescription(Minecraft minecraft, int offsetX, int offsetY) + { GL11.glPushMatrix(); if (hasRecipe) GL11.glTranslated(offsetX + 5, offsetY + 75, 1); else GL11.glTranslated(offsetX + 5, offsetY + 40, 1); @@ -116,7 +157,7 @@ public class CraftingInfoPage extends TitledPage { s = s.substring(2); offset += fontRendererObj.FONT_HEIGHT / 2; } - fontRendererObj.drawString(s, 0, offset, Color.white.getRGB()); + fontRendererObj.drawString(s, 0, offset, Color.black.getRGB()); offset += fontRendererObj.FONT_HEIGHT; } GL11.glPopMatrix(); @@ -124,7 +165,8 @@ public class CraftingInfoPage extends TitledPage { @SuppressWarnings("unchecked") - public List getFormattedText(FontRenderer fr) { + public List getFormattedText(FontRenderer fr) + { if (formattedDescription == null) { formattedDescription = new ArrayList(); @@ -137,7 +179,7 @@ public class CraftingInfoPage extends TitledPage { return formattedDescription; } - List segments = new ArrayList(); //Each separate string that is separated by a \n + List segments = new ArrayList(); String raw = rawDescription; @@ -159,7 +201,8 @@ public class CraftingInfoPage extends TitledPage { return formattedDescription; } - protected void drawItemStackTooltip(ItemStack stack, int x, int y) { + protected void drawItemStackTooltip(ItemStack stack, int x, int y) + { final Minecraft mc = Minecraft.getMinecraft(); FontRenderer font = Objects.firstNonNull(stack.getItem().getFontRenderer(stack), mc.fontRendererObj); @@ -175,7 +218,8 @@ public class CraftingInfoPage extends TitledPage { drawHoveringText(colored, x, y, font); } - private void drawItemStack(ItemStack par1ItemStack, int par2, int par3, String par4Str) { + private void drawItemStack(ItemStack par1ItemStack, int par2, int par3, String par4Str) + { GL11.glTranslatef(0.0F, 0.0F, 32.0F); this.zLevel = 200.0F; RenderHelper.enableGUIStandardItemLighting(); @@ -204,9 +248,11 @@ public class CraftingInfoPage extends TitledPage { } @SuppressWarnings("unchecked") - private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) { + private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) + { ItemStack[] recipeItems = new ItemStack[9]; - for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) { + for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) + { if (recipe == null) continue; ItemStack result = recipe.getRecipeOutput(); @@ -224,9 +270,11 @@ public class CraftingInfoPage extends TitledPage { Iterator iterator = FurnaceRecipes.instance().getSmeltingList().entrySet().iterator(); Map.Entry entry; - while (iterator.hasNext()) { + while (iterator.hasNext()) + { entry = (Map.Entry) iterator.next(); - if (entry.getKey() instanceof ItemStack && ((ItemStack) entry.getValue()).isItemEqual(result)) { + if (entry.getKey() instanceof ItemStack && ((ItemStack) entry.getValue()).isItemEqual(result)) + { isSmelting = true; recipeItems[0] = (ItemStack) entry.getKey(); } @@ -235,7 +283,8 @@ public class CraftingInfoPage extends TitledPage { return recipeItems; } - protected ItemStack convertToStack(Object obj) { + protected ItemStack convertToStack(Object obj) + { ItemStack entry = null; if (obj instanceof ItemStack) { entry = (ItemStack) obj; @@ -252,7 +301,8 @@ public class CraftingInfoPage extends TitledPage { } @SuppressWarnings("unchecked") - private Object[] getRecipeInput(IRecipe recipe) { + private Object[] getRecipeInput(IRecipe recipe) + { if (recipe instanceof ShapelessOreRecipe) return ((ShapelessOreRecipe) recipe).getInput().toArray(); else if (recipe instanceof ShapedOreRecipe) return getShapedOreRecipe((ShapedOreRecipe) recipe); else if (recipe instanceof ShapedRecipes) return ((ShapedRecipes) recipe).recipeItems; @@ -261,30 +311,41 @@ public class CraftingInfoPage extends TitledPage { return null; } - private Object[] getShapedOreRecipe(ShapedOreRecipe recipe) { - try { + private Object[] getShapedOreRecipe(ShapedOreRecipe recipe) + { + try + { Field field = ShapedOreRecipe.class.getDeclaredField("width"); if (field != null) { field.setAccessible(true); int width = field.getInt(recipe); Object[] input = recipe.getInput(); Object[] grid = new Object[9]; - for (int i = 0, offset = 0, y = 0; y < 3; y++) { + for (int i = 0, offset = 0, y = 0; y < 3; y++) + { for (int x = 0; x < 3; x++, i++) { - if (x < width && offset < input.length) { + if (x < width && offset < input.length) + { grid[i] = input[offset]; offset++; - } else { + } else + { grid[i] = null; } } } return grid; } - } catch (Exception e) { + } catch (Exception e) + { e.printStackTrace(); } return null; } - + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(backpage); + } } diff --git a/src/main/java/techreborn/manual/pages/DescriptionPage.java b/src/main/java/techreborn/manual/pages/DescriptionPage.java index 53d7b8371..2ec467681 100644 --- a/src/main/java/techreborn/manual/pages/DescriptionPage.java +++ b/src/main/java/techreborn/manual/pages/DescriptionPage.java @@ -11,26 +11,29 @@ import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import techreborn.manual.PageCollection; import techreborn.manual.Reference; +import techreborn.manual.util.ButtonUtil; public class DescriptionPage extends TitledPage { public boolean hasImage; + public String secondpage; private String rawDescription; private List formattedDescription; private float descriptionScale = 0.88f; public String imageprefix = "techreborn:textures/manual/screenshots/"; - public DescriptionPage(String name, PageCollection collection, boolean hasImage) + public DescriptionPage(String name, PageCollection collection, boolean hasImage, String secondPage) { super(name, false, collection, Reference.GETTINGSTARTED_KEY, Color.white.getRGB()); this.hasImage = hasImage; this.rawDescription = "techreborn.manual." + this.getReferenceName() + ".description"; + this.secondpage = secondPage; } @Override @@ -39,12 +42,23 @@ public class DescriptionPage extends TitledPage if(hasImage) { renderImage(offsetX, offsetY); - addDescription(mc, offsetX, offsetY + 50); + addDescription(mc, offsetX, offsetY + 60); } else addDescription(mc, offsetX, offsetY); } + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + if(secondpage != null) + { + ButtonUtil.addNextButton(1, width / 2 + 40, height / 2 + 64, buttonList); + } + } + public void renderImage(int offsetX, int offsetY) { TextureManager render = Minecraft.getMinecraft().renderEngine; @@ -53,7 +67,7 @@ public class DescriptionPage extends TitledPage GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); - drawTexturedModalRect(offsetX, offsetY - 16, 0, 0, 120, this.height); + drawTexturedModalRect(offsetX, offsetY - 14, 0, 0, 120, this.height); GL11.glDisable(GL11.GL_BLEND); } @@ -103,4 +117,15 @@ public class DescriptionPage extends TitledPage } return formattedDescription; } + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(Reference.pageNames.GETTINGSTARTED_PAGE); + + if(secondpage != null) + { + if (button.id == 1) collection.changeActivePage(secondpage); + } + } } diff --git a/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java b/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java new file mode 100644 index 000000000..a80b840c5 --- /dev/null +++ b/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java @@ -0,0 +1,47 @@ +package techreborn.manual.pages; + +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import techreborn.init.ModBlocks; +import techreborn.manual.PageCollection; +import techreborn.manual.Reference; +import techreborn.manual.util.ButtonUtil; +import techreborn.manual.util.GuiButtonItemTexture; + +public class GeneratingPowerPage extends TitledPage +{ + public GeneratingPowerPage(String name, PageCollection collection) + { + super(name, false, collection, Reference.GENERATINGPOWER_KEY, Color.white.getRGB()); + } + + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, new ItemStack(ModBlocks.Generator), + ModBlocks.Generator.getUnlocalizedName(), ttl(ModBlocks.Generator.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModBlocks.thermalGenerator), + ModBlocks.thermalGenerator.getUnlocalizedName(), ttl(ModBlocks.thermalGenerator.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20, new ItemStack(ModBlocks.solarPanel), + ModBlocks.solarPanel.getUnlocalizedName(), ttl(ModBlocks.solarPanel.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20, new ItemStack(ModBlocks.heatGenerator), + ModBlocks.heatGenerator.getUnlocalizedName(), ttl(ModBlocks.heatGenerator.getLocalizedName()))); + buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20, new ItemStack(ModBlocks.LightningRod), + ModBlocks.LightningRod.getUnlocalizedName(), ttl(ModBlocks.LightningRod.getLocalizedName()))); + } + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); + if (button.id == 1) collection.changeActivePage(ModBlocks.Generator.getLocalizedName()); + if (button.id == 2) collection.changeActivePage(ModBlocks.thermalGenerator.getLocalizedName()); + if (button.id == 3) collection.changeActivePage(ModBlocks.solarPanel.getLocalizedName()); + if (button.id == 4) collection.changeActivePage(ModBlocks.heatGenerator.getLocalizedName()); + if (button.id == 5) collection.changeActivePage(ModBlocks.LightningRod.getLocalizedName()); + } +} diff --git a/src/main/java/techreborn/manual/pages/GettingStartedPage.java b/src/main/java/techreborn/manual/pages/GettingStartedPage.java index 99b7b44fb..f112b3a22 100644 --- a/src/main/java/techreborn/manual/pages/GettingStartedPage.java +++ b/src/main/java/techreborn/manual/pages/GettingStartedPage.java @@ -7,7 +7,8 @@ import techreborn.items.ItemParts; import techreborn.items.ItemPlates; import techreborn.manual.PageCollection; import techreborn.manual.Reference; -import techreborn.manual.util.GuiButtonCustomTexture; +import techreborn.manual.util.ButtonUtil; +import techreborn.manual.util.GuiButtonItemTexture; public class GettingStartedPage extends TitledPage { @@ -20,13 +21,19 @@ public class GettingStartedPage extends TitledPage public void initGui() { buttonList.clear(); - buttonList.add(new GuiButtonCustomTexture(0, getXMin() + 25, getYMin() + 20, 0, 46, 100, 20, ItemParts.getPartByName("rubberSap"), - Reference.pageNames.GETTINGRUBBER_PAGE, ttl(Reference.GETTINGRUBBER_KEY))); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, ItemParts.getPartByName("rubberSap"), + Reference.pageNames.GETTINGRUBBER_PAGE, ttl(Reference.GETTINGRUBBER_KEY))); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, ItemPlates.getPlateByName("iron"), + Reference.pageNames.CRAFTINGPLATES_PAGE, ttl(Reference.CRAFTINGPLATES_KEY))); } @Override public void actionPerformed(GuiButton button) { - if (button.id == 0) collection.changeActivePage(Reference.pageNames.GETTINGRUBBER_PAGE); + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); + if (button.id == 1) collection.changeActivePage(Reference.pageNames.GETTINGRUBBER_PAGE); + if (button.id == 2) collection.changeActivePage(Reference.pageNames.CRAFTINGPLATES_PAGE); + } } diff --git a/src/main/java/techreborn/manual/pages/ToolsPage.java b/src/main/java/techreborn/manual/pages/ToolsPage.java new file mode 100644 index 000000000..23159bd4a --- /dev/null +++ b/src/main/java/techreborn/manual/pages/ToolsPage.java @@ -0,0 +1,63 @@ +package techreborn.manual.pages; + +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import techreborn.init.ModBlocks; +import techreborn.init.ModItems; +import techreborn.manual.PageCollection; +import techreborn.manual.Reference; +import techreborn.manual.util.ButtonUtil; +import techreborn.manual.util.GuiButtonItemTexture; + +public class ToolsPage extends TitledPage +{ + public ToolsPage(String name, PageCollection collection) + { + super(name, false, collection, Reference.TOOLS_KEY, Color.white.getRGB()); + } + + @Override + public void initGui() + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + ButtonUtil.addNextButton(1, width / 2 + 40, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, new ItemStack(ModItems.ironDrill), + ModItems.ironDrill.getUnlocalizedName(), ttl(ModItems.ironDrill.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModItems.diamondDrill), + ModItems.diamondDrill.getUnlocalizedName(), ttl(ModItems.diamondDrill.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20, new ItemStack(ModItems.advancedDrill), + ModItems.advancedDrill.getUnlocalizedName(), ttl(ModItems.advancedDrill.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20, new ItemStack(ModItems.ironChainsaw), + ModItems.ironChainsaw.getUnlocalizedName(), ttl(ModItems.ironChainsaw.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(6, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20, new ItemStack(ModItems.diamondChainsaw), + ModItems.diamondChainsaw.getUnlocalizedName(), ttl(ModItems.diamondChainsaw.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(7, getXMin() + 20, getYMin() + 120, 0, 46, 100, 20, new ItemStack(ModItems.advancedChainsaw), + ModItems.advancedChainsaw.getUnlocalizedName(), ttl(ModItems.advancedChainsaw.getUnlocalizedName() + ".name"))); + } + + @Override + public void actionPerformed(GuiButton button) + { + if (button.id == 0) collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE); + if (button.id == 1) + { + buttonList.clear(); + ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList); + buttonList.add(new GuiButtonItemTexture(8, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20, new ItemStack(ModItems.omniTool), + ModItems.omniTool.getUnlocalizedName(), ttl(ModItems.omniTool.getUnlocalizedName() + ".name"))); + buttonList.add(new GuiButtonItemTexture(9, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20, new ItemStack(ModItems.treeTap), + ModItems.treeTap.getUnlocalizedName(), ttl(ModItems.treeTap.getUnlocalizedName() + ".name"))); + } + if (button.id == 2) collection.changeActivePage(ModItems.ironDrill.getUnlocalizedName() + ".name"); + if (button.id == 3) collection.changeActivePage(ModItems.diamondDrill.getUnlocalizedName() + ".name"); + if (button.id == 4) collection.changeActivePage(ModItems.advancedDrill.getUnlocalizedName() + ".name"); + if (button.id == 5) collection.changeActivePage(ModItems.ironChainsaw.getUnlocalizedName() + ".name"); + if (button.id == 6) collection.changeActivePage(ModItems.diamondChainsaw.getUnlocalizedName() + ".name"); + if (button.id == 7) collection.changeActivePage(ModItems.advancedChainsaw.getUnlocalizedName() + ".name"); + if (button.id == 8) collection.changeActivePage(ModItems.omniTool.getUnlocalizedName() + ".name"); + if (button.id == 9) collection.changeActivePage(ModItems.treeTap.getUnlocalizedName() + ".name"); + } +} diff --git a/src/main/java/techreborn/manual/util/ButtonUtil.java b/src/main/java/techreborn/manual/util/ButtonUtil.java new file mode 100644 index 000000000..e86a09035 --- /dev/null +++ b/src/main/java/techreborn/manual/util/ButtonUtil.java @@ -0,0 +1,22 @@ +package techreborn.manual.util; + +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ButtonUtil +{ + @SideOnly(Side.CLIENT) + public static void addBackButton(int ID, int X, int Y, List buttonList) + { + buttonList.add(new GuiButtonCustomTexture(ID, X, Y, 50, 60, 17, 12, "button", "", "", 0, 11, 10, 16)); + } + + @SideOnly(Side.CLIENT) + public static void addNextButton(int ID, int X, int Y, List buttonList) + { + buttonList.add(new GuiButtonCustomTexture(ID, X, Y, 50, 60, 17, 12, "button", "", "", 0, 1, 10, 17)); + } +} diff --git a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java index 6f1e01a38..450bae207 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java +++ b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java @@ -1,10 +1,11 @@ package techreborn.manual.util; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL11; public class GuiButtonAHeight extends GuiButton { diff --git a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java index 2162e5350..c4ec159fe 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java @@ -1,33 +1,50 @@ package techreborn.manual.util; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiButtonExt; -import org.lwjgl.opengl.GL11; - -import java.awt.*; - -public class GuiButtonCustomTexture extends GuiButtonExt { +public class GuiButtonCustomTexture extends GuiButtonExt +{ public int textureU; public int textureV; - public ItemStack itemstack; + public String texturename; public String LINKED_PAGE; public String NAME; + public String imageprefix = "techreborn:textures/manual/elements/"; + public int buttonHeight; + public int buttonWidth; + public int buttonU; + public int buttonV; + public int textureH; + public int textureW; - public GuiButtonCustomTexture(int id, int xPos, int yPos, int u, int v, int width, int height, ItemStack stack, String linkedPage, String name) { - super(id, xPos, yPos, width, height, "_"); - textureU = u; - textureV = v; - itemstack = stack; - NAME = name; + public GuiButtonCustomTexture(int id, int xPos, int yPos, int u, int v, int buttonWidth, int buttonHeight, String texturename, String linkedPage, String name, int buttonU, int buttonV, int textureH, int textureW) + { + super(id, xPos, yPos, buttonWidth, buttonHeight, "_"); + this.textureU = u; + this.textureV = v; + this.texturename = texturename; + this.NAME = name; this.LINKED_PAGE = linkedPage; + this.buttonHeight = height; + this.buttonWidth = width; + this.buttonU = buttonU; + this.buttonV = buttonV; + this.textureH = textureH; + this.textureW = textureW; } - - public void drawButton(Minecraft mc, int mouseX, int mouseY) { - if (this.visible) { + + public void drawButton(Minecraft mc, int mouseX, int mouseY) + { + if (this.visible) + { boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; @@ -35,7 +52,8 @@ public class GuiButtonCustomTexture extends GuiButtonExt { int u = textureU; int v = textureV; - if (flag) { + if (flag) + { u += width; GL11.glPushMatrix(); GL11.glColor4f(0f, 0f, 0f, 1f); @@ -46,14 +64,25 @@ public class GuiButtonCustomTexture extends GuiButtonExt { GL11.glEnable(32826); RenderHelper.enableStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting(); - RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); - itemRenderer.renderItemIntoGUI(itemstack, this.xPosition, this.yPosition); + renderImage(this.xPosition, this.yPosition); this.drawString(mc.fontRendererObj, this.NAME, this.xPosition + 20, this.yPosition + 3, Color.white.getRGB()); } } + + public void renderImage(int offsetX, int offsetY) + { + TextureManager render = Minecraft.getMinecraft().renderEngine; + render.bindTexture(new ResourceLocation(imageprefix + this.texturename + ".png")); - public boolean getIsHovering() { - return hovered; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1F, 1F, 1F, 1F); + drawTexturedModalRect(offsetX, offsetY, this.buttonU, this.buttonV, this.textureW, this.textureH); + GL11.glDisable(GL11.GL_BLEND); } + public boolean getIsHovering() + { + return hovered; + } } diff --git a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java new file mode 100644 index 000000000..b1d8eb5b2 --- /dev/null +++ b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java @@ -0,0 +1,60 @@ +package techreborn.manual.util; + +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.client.config.GuiButtonExt; + +public class GuiButtonItemTexture extends GuiButtonExt { + + public int textureU; + public int textureV; + public ItemStack itemstack; + public String LINKED_PAGE; + public String NAME; + + public GuiButtonItemTexture(int id, int xPos, int yPos, int u, int v, int width, int height, ItemStack stack, String linkedPage, String name) { + super(id, xPos, yPos, width, height, "_"); + textureU = u; + textureV = v; + itemstack = stack; + NAME = name; + this.LINKED_PAGE = linkedPage; + } + + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.visible) { + boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; + mc.getTextureManager().bindTexture(buttonTextures); + int u = textureU; + int v = textureV; + + if (flag) { + u += width; + GL11.glPushMatrix(); + GL11.glColor4f(0f, 0f, 0f, 1f); + this.drawTexturedModalRect(this.xPosition, this.yPosition, u, v, width, height); + GL11.glPopMatrix(); + } + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(32826); + RenderHelper.enableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); + itemRenderer.renderItemIntoGUI(itemstack, this.xPosition, this.yPosition); + this.drawString(mc.fontRendererObj, this.NAME, this.xPosition + 20, this.yPosition + 3, Color.white.getRGB()); + } + } + + public boolean getIsHovering() { + return hovered; + } + +} diff --git a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java index 72e6a2c19..4e866031e 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java +++ b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java @@ -1,13 +1,14 @@ package techreborn.manual.util; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; - -import java.awt.*; public class GuiButtonTextOnly extends GuiButton { public String LINKED_PAGE; diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index ed86871e6..1310f9f71 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -1,11 +1,11 @@ package techreborn.packets; +import java.io.IOException; + import io.netty.buffer.ByteBuf; import reborncore.common.packets.SimplePacket; import techreborn.tiles.TileAesu; -import java.io.IOException; - public class PacketAesu extends SimplePacket { diff --git a/src/main/java/techreborn/packets/PacketIdsu.java b/src/main/java/techreborn/packets/PacketIdsu.java index c60d6ad19..cdea1ad91 100644 --- a/src/main/java/techreborn/packets/PacketIdsu.java +++ b/src/main/java/techreborn/packets/PacketIdsu.java @@ -1,11 +1,11 @@ package techreborn.packets; +import java.io.IOException; + import io.netty.buffer.ByteBuf; import reborncore.common.packets.SimplePacket; import techreborn.tiles.idsu.TileIDSU; -import java.io.IOException; - public class PacketIdsu extends SimplePacket { diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index f456e4a5e..4e93cbe87 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -3,7 +3,11 @@ package techreborn.proxies; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import reborncore.client.multiblock.MultiblockRenderEvent; -import techreborn.client.*; +import techreborn.client.ClientMultiBlocks; +import techreborn.client.IconSupplier; +import techreborn.client.RegisterItemJsons; +import techreborn.client.StackToolTipEvent; +import techreborn.client.VersionCheckerClient; import techreborn.client.hud.ChargeHud; import techreborn.client.keybindings.KeyBindings; diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index bde26b39e..e2807d3cb 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -7,7 +7,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 1d410e6f2..d6a958824 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -16,8 +18,6 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import java.util.List; - public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory, IListInfoProvider { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 099ecc7a3..ba4957e40 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -16,8 +18,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; -import java.util.List; - public class TileDigitalChest extends TileMachineBase implements IInventory, IWrenchable, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java index d2302aec6..ceb842fa2 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java @@ -10,7 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 17ac88830..47a7cd706 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -10,7 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.IListInfoProvider; import reborncore.common.misc.Location; import reborncore.common.powerSystem.TilePowerAcceptor; diff --git a/src/main/java/techreborn/tiles/TilePlayerDectector.java b/src/main/java/techreborn/tiles/TilePlayerDectector.java index 92baefdaa..eaacede65 100644 --- a/src/main/java/techreborn/tiles/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/TilePlayerDectector.java @@ -1,13 +1,13 @@ package techreborn.tiles; +import java.util.Iterator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; -import java.util.Iterator; - public class TilePlayerDectector extends TilePowerAcceptor { diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 14d67b9a6..7593c21c6 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -17,8 +19,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; -import java.util.List; - public class TileQuantumChest extends TileMachineBase implements IInventory, IWrenchable, IDeepStorageUnit, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 855aa74ed..629582852 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,8 +23,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.init.ModBlocks; -import java.util.List; - public class TileQuantumTank extends TileMachineBase implements IFluidHandler, IInventory, IWrenchable, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/TileThermalGenerator.java index 96d2c2ad3..8929cd003 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/TileThermalGenerator.java @@ -12,7 +12,12 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index cd1618315..4c9e11dab 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -10,7 +10,11 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.fuel.FluidPowerManager; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 1ef7fb063..9148be421 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -1,5 +1,8 @@ package techreborn.tiles.generator; +import java.util.HashMap; +import java.util.Map; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,7 +13,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -18,9 +26,6 @@ import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.HashMap; -import java.util.Map; - public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 230a812e2..981132238 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -1,19 +1,13 @@ package techreborn.tiles.generator; import ic2.api.tile.IWrenchable; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fml.common.network.PacketLoggingHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index bfd14a875..fdf5eedf6 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -1,5 +1,8 @@ package techreborn.tiles.generator; +import java.util.HashMap; +import java.util.Map; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,7 +13,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -18,9 +26,6 @@ import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.HashMap; -import java.util.Map; - public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index c797f2c2a..e1fe723ac 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -1,13 +1,11 @@ package techreborn.tiles.generator; -import com.mojang.realmsclient.gui.ChatFormatting; +import java.util.List; + import net.minecraft.util.EnumFacing; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.blocks.generator.BlockSolarPanel; -import java.util.List; - /** * Created by mark on 25/02/2016. */ diff --git a/src/main/java/techreborn/tiles/idsu/IDSUManager.java b/src/main/java/techreborn/tiles/idsu/IDSUManager.java index df3121b31..a37389530 100644 --- a/src/main/java/techreborn/tiles/idsu/IDSUManager.java +++ b/src/main/java/techreborn/tiles/idsu/IDSUManager.java @@ -1,19 +1,24 @@ package techreborn.tiles.idsu; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.TreeMap; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; + import net.minecraft.world.World; import net.minecraft.world.storage.ISaveHandler; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import java.io.*; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.TreeMap; - public class IDSUManager { diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 72e030da2..d962583a3 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -1,10 +1,11 @@ package techreborn.tiles.idsu; +import org.apache.commons.lang3.StringUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import org.apache.commons.lang3.StringUtils; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index a981b7113..b4e6f568d 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -1,14 +1,14 @@ package techreborn.tiles.lesu; +import java.util.ArrayList; + import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; -import java.util.ArrayList; - public class TileLesu extends TilePowerAcceptor {//TODO wrench private ArrayList countedNetworks = new ArrayList(); diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index 99d59eb24..6a1b6eff8 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; @@ -10,8 +12,6 @@ import net.minecraftforge.common.IPlantable; import techreborn.blocks.BlockRubberLog; import techreborn.init.ModBlocks; -import java.util.Random; - public class RubberTreeGenerator extends WorldGenerator { boolean isWorldGen = true; diff --git a/src/main/java/techreborn/world/TROreGen.java b/src/main/java/techreborn/world/TROreGen.java index bdc10ab42..6de36c982 100644 --- a/src/main/java/techreborn/world/TROreGen.java +++ b/src/main/java/techreborn/world/TROreGen.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -9,8 +11,6 @@ import techreborn.Core; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.Random; - public class TROreGen implements IWorldGenerator { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/world/TreeGenerator.java b/src/main/java/techreborn/world/TreeGenerator.java index 0fdeb3e74..4cdd24027 100644 --- a/src/main/java/techreborn/world/TreeGenerator.java +++ b/src/main/java/techreborn/world/TreeGenerator.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -8,8 +10,6 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.fml.common.IWorldGenerator; import techreborn.config.ConfigTechReborn; -import java.util.Random; - /** * Created by Mark on 19/02/2016. */ diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 3bb9c2687..92401c57c 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -927,8 +927,15 @@ Cable.tinCable.name=Tin Cable #Manual techreborn.manual.contents=Contents Page techreborn.manual.gettingstarted=Getting Started +techreborn.manual.generatingpower=Generating Power +techreborn.manual.basicmachines=Basic Machines +techreborn.manual.advancedmachines=Advanced Machines +techreborn.manual.tools=Tools + techreborn.manual.gettingrubber=Collecting Rubber techreborn.manual.backbutton=Back +techreborn.manual.gettingplates=Crafting Plates + item.techreborn.advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3. tile.techreborn.alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines. diff --git a/src/main/resources/assets/techreborn/textures/manual/elements/button.png b/src/main/resources/assets/techreborn/textures/manual/elements/button.png new file mode 100644 index 000000000..63fd634bf Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/manual/elements/button.png differ