diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 5d13a9ce8..6ef7a90fb 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -14,7 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; 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.EntityRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import org.apache.commons.lang3.time.StopWatch; import reborncore.api.recipe.RecipeHandler; @@ -32,7 +31,6 @@ import techreborn.compat.CompatManager; import techreborn.compat.ICompatModule; import techreborn.config.ConfigTechReborn; import techreborn.dispenser.BehaviorDispenseScrapbox; -import techreborn.entitys.EntityNukePrimed; import techreborn.events.BlockBreakHandler; import techreborn.events.OreUnifier; import techreborn.events.TRTickHandler; @@ -99,7 +97,7 @@ public class Core { // Register ModItems ModItems.init(); // Entitys - // EntityRegistry.registerModEntity(EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); + // EntityRegistry.registerModEntity(EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); proxy.preInit(event); diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java index dfc76b421..4a86aba89 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java @@ -11,7 +11,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe { public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { - super(Reference.industrialGrinderRecipe, tickTime, (int) (euPerTick /2.5)); // Buff energy usage to be more in line with other machines + super(Reference.industrialGrinderRecipe, tickTime, (int) (euPerTick / 2.5)); // Buff energy usage to be more in line with other machines if (input1 != null) inputs.add(input1); if (output1 != null) diff --git a/src/main/java/techreborn/blocks/BlockFlare.java b/src/main/java/techreborn/blocks/BlockFlare.java index 7a116fe63..f3e177036 100644 --- a/src/main/java/techreborn/blocks/BlockFlare.java +++ b/src/main/java/techreborn/blocks/BlockFlare.java @@ -7,7 +7,6 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +21,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.tiles.TileEntityFlare; -import javax.annotation.Nullable; import java.util.List; /** diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 8ea86172f..30e691ad5 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -21,7 +21,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 { diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index 0e5b98211..9e05b76d0 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -17,7 +17,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; import java.security.InvalidParameterException; -import java.util.List; public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" }; diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index bb798d14a..0704d3bcf 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -10,7 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index eff1d9abf..473a28d31 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -2,7 +2,6 @@ package techreborn.blocks; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -33,7 +32,7 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, - EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!playerIn.isSneaking()) playerIn.openGui(Core.INSTANCE, GuiHandler.quantumChestID, worldIn, pos.getX(), pos.getY(), pos.getZ()); return true; diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 256c3a3f8..2e0049b24 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -65,13 +65,13 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO } //TODO 1.11: what is this? -// @Override -// protected ItemStack createStackedBlock(IBlockState state) { -// IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE, -// false); -// -// return super.createStackedBlock(newState); -// } + // @Override + // protected ItemStack createStackedBlock(IBlockState state) { + // IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE, + // false); + // + // return super.createStackedBlock(newState); + // } @Override public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) { diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 73bf6ed88..835105f8c 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.world.RubberTreeGenerator; -import java.util.List; import java.util.Random; /** diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 681f2376b..c5af726f6 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -16,7 +16,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 { diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index a62e6dec6..ffd90e6d0 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -17,7 +17,6 @@ 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 { diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index c87044af3..281372f8b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -66,7 +66,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { @Override public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, - float hitZ, int meta, EntityLivingBase placer) { + float hitZ, int meta, EntityLivingBase placer) { if (!worldIn.isRemote) { if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering() && worldIn.isDaytime()) { return this.getDefaultState().withProperty(ACTIVE, true); diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 97a41e79d..7b810b322 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -3,7 +3,6 @@ package techreborn.blocks.machine; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index 58253db9b..bd7521dc6 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -26,7 +26,7 @@ public class BlockIDSU extends BlockEnergyStorage { @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, - float hitZ, int meta, EntityLivingBase placer) { + float hitZ, int meta, EntityLivingBase placer) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileIDSU) { ((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString(); diff --git a/src/main/java/techreborn/client/TechRebornCreativeTab.java b/src/main/java/techreborn/client/TechRebornCreativeTab.java index c869cffd4..a4e57cc6b 100644 --- a/src/main/java/techreborn/client/TechRebornCreativeTab.java +++ b/src/main/java/techreborn/client/TechRebornCreativeTab.java @@ -1,7 +1,6 @@ package techreborn.client; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java b/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java index 17c5c2374..b4d8d7bcd 100644 --- a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java +++ b/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java @@ -1,7 +1,6 @@ package techreborn.client; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.init.ModItems; diff --git a/src/main/java/techreborn/client/container/ContainerExtractor.java b/src/main/java/techreborn/client/container/ContainerExtractor.java index 98b6f2b03..3d911b6a1 100644 --- a/src/main/java/techreborn/client/container/ContainerExtractor.java +++ b/src/main/java/techreborn/client/container/ContainerExtractor.java @@ -1,18 +1,12 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumFacing; -import reborncore.api.tile.IContainerLayout; import reborncore.client.gui.slots.BaseSlot; import reborncore.client.gui.slots.SlotInput; import reborncore.client.gui.slots.SlotOutput; -import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileExtractor; -import javax.annotation.Nullable; -import java.util.List; - public class ContainerExtractor extends ContainerCrafting { EntityPlayer player; diff --git a/src/main/java/techreborn/client/container/ContainerGrinder.java b/src/main/java/techreborn/client/container/ContainerGrinder.java index 5f3f4fa2a..3cff28cd3 100644 --- a/src/main/java/techreborn/client/container/ContainerGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerGrinder.java @@ -1,18 +1,12 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumFacing; -import reborncore.api.tile.IContainerLayout; import reborncore.client.gui.slots.BaseSlot; import reborncore.client.gui.slots.SlotInput; import reborncore.client.gui.slots.SlotOutput; -import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileGrinder; -import javax.annotation.Nullable; -import java.util.List; - public class ContainerGrinder extends ContainerCrafting { public int connectionStatus; @@ -31,7 +25,6 @@ public class ContainerGrinder extends ContainerCrafting { return true; } - public void addInventorySlots() { // input this.addSlotToContainer(new SlotInput(tile.inventory, 0, 56, 34)); @@ -46,7 +39,6 @@ public class ContainerGrinder extends ContainerCrafting { addPlayerSlots(); } - public void addPlayerSlots() { int i; diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index d7ad1b677..602c92b94 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -38,13 +38,13 @@ public class CompatManager { register(RecipesIC2.class, "IC2"); } - public void register(Class moduleClass,Object... objs){ + public void register(Class moduleClass, Object... objs) { registerCompact(moduleClass, true, objs); } public void registerCompact(Class moduleClass, boolean config, Object... objs) { boolean shouldLoad = true; - if(config){ + if (config) { shouldLoad = ConfigTechReborn.config .get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true, "Should the " + moduleClass.getSimpleName() + " be loaded?") @@ -75,7 +75,7 @@ public class CompatManager { return; } } - if(config){ + if (config) { if (ConfigTechReborn.config.hasChanged()) ConfigTechReborn.config.save(); if (!shouldLoad) { diff --git a/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java b/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java index 095e8fe7a..55bcfaded 100644 --- a/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java +++ b/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java @@ -17,7 +17,7 @@ public class CompatModuleTinkers implements ICompatModule { @Override public void preInit(FMLPreInitializationEvent event) { - // TinkersFluids.init(); + // TinkersFluids.init(); } @Override diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index ba5505e7a..c8eb1b9ad 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import techreborn.items.ItemGems; -import techreborn.items.ItemParts; import techreborn.utils.OreDictUtils; /** @@ -13,14 +12,14 @@ import techreborn.utils.OreDictUtils; */ public class BlockBreakHandler { - @SubscribeEvent - public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) { - for (ItemStack ore : event.getDrops()) { - if (OreDictUtils.isOre(ore, "gemRuby")) { - EntityItem item = new EntityItem(event.getWorld(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), - ItemGems.getGemByName("redGarnet").copy()); - event.getWorld().spawnEntity(item); - } - } - } + @SubscribeEvent + public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) { + for (ItemStack ore : event.getDrops()) { + if (OreDictUtils.isOre(ore, "gemRuby")) { + EntityItem item = new EntityItem(event.getWorld(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), + ItemGems.getGemByName("redGarnet").copy()); + event.getWorld().spawnEntity(item); + } + } + } } diff --git a/src/main/java/techreborn/events/TRTickHandler.java b/src/main/java/techreborn/events/TRTickHandler.java index 5d64a7082..267e2956e 100644 --- a/src/main/java/techreborn/events/TRTickHandler.java +++ b/src/main/java/techreborn/events/TRTickHandler.java @@ -42,8 +42,8 @@ public class TRTickHandler { MinecraftForge.EVENT_BUS.post(new PowerTickEvent()); long elapsed = System.nanoTime() - start; tickTime += elapsed; - ticksCounted ++; - if(ticksCounted == 20 * 5){ + ticksCounted++; + if (ticksCounted == 20 * 5) { //Enable this this line to get some infomation when debuging. //System.out.println("Average powernet tick time over last 5 seconds: " + (tickTime / ticksCounted) + "ns"); ticksCounted = 0; diff --git a/src/main/java/techreborn/init/IC2Dict.java b/src/main/java/techreborn/init/IC2Dict.java index 870f55f0b..137d1e6db 100644 --- a/src/main/java/techreborn/init/IC2Dict.java +++ b/src/main/java/techreborn/init/IC2Dict.java @@ -1,6 +1,5 @@ package techreborn.init; - import techreborn.Core; /** @@ -11,52 +10,52 @@ public class IC2Dict { //TODO IC2 public static void init() { try { -// CraftingItemType.circuit.getName(); -// -// OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack()); -// -// OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit)); -// OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit)); -// -// OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine)); -// OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine)); -// -// OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack()); -// OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack()); -// -// OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack()); -// OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack()); -// OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack()); -// -// ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt); -// industrialTnt.setItemDamage(1); -// OreDictionary.registerOre("industrialTnt", industrialTnt); -// -// OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond)); -// OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff)); -// OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer)); -// -// //TODO: -// -// //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold)); -// -// //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator); -// //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel); -// //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder); -// //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor); -// //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill); -// //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill); -// -// OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235)); -// OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238)); -// OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238)); -// OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235)); -// -// OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron)); -// OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack()); -// OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced)); -// -// OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore)); + // CraftingItemType.circuit.getName(); + // + // OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack()); + // + // OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit)); + // OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit)); + // + // OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine)); + // OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine)); + // + // OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack()); + // OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack()); + // + // OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack()); + // OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack()); + // OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack()); + // + // ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt); + // industrialTnt.setItemDamage(1); + // OreDictionary.registerOre("industrialTnt", industrialTnt); + // + // OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond)); + // OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff)); + // OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer)); + // + // //TODO: + // + // //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold)); + // + // //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator); + // //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel); + // //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder); + // //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor); + // //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill); + // //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill); + // + // OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235)); + // OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238)); + // OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238)); + // OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235)); + // + // OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron)); + // OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack()); + // OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced)); + // + // OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore)); } catch (NoClassDefFoundError notFound) { Core.logHelper.warn( "Can't enable integration: IC2 installed but cannot be hooked\n" + diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 713474813..74588684e 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -1,11 +1,9 @@ package techreborn.init; import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemColored; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; @@ -23,7 +21,6 @@ import techreborn.blocks.tier1.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockMVTransformer; -import techreborn.client.TechRebornCreativeTabMisc; import techreborn.itemblocks.*; import techreborn.tiles.*; import techreborn.tiles.fusionReactor.TileEntityFusionController; @@ -384,13 +381,13 @@ public class ModBlocks { GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); //TODO enable when done -// flare = new BlockFlare(); -// registerBlock(flare, "flare"); -// ItemBlock itemBlock = new ItemColored(flare, true); -// itemBlock.setRegistryName("flareItemBlock"); -// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance); -// GameRegistry.register(itemBlock); -// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR"); + // flare = new BlockFlare(); + // registerBlock(flare, "flare"); + // ItemBlock itemBlock = new ItemColored(flare, true); + // itemBlock.setRegistryName("flareItemBlock"); + // itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance); + // GameRegistry.register(itemBlock); + // GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR"); registerOreDict(); Core.logHelper.info("TechReborns Blocks Loaded"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 968518e28..ee3c0bfd6 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -453,7 +453,7 @@ public class ModRecipes { continue; } dust = dust.copy(); - if(ore){ + if (ore) { dust.setCount(2); } RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22)); @@ -1013,7 +1013,7 @@ public class ModRecipes { "circuitBasic"); TechRebornAPI - .addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil",3), "NCN", "C C", "NCN", + .addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper"); RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"), @@ -2080,8 +2080,8 @@ public class ModRecipes { getOre("ic2Extractor")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H', - ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B', - BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace); + ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B', + BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E', ModBlocks.IndustrialElectrolyzer, 'P', ModBlocks.Extractor, 'C', diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index d819bcef7..208850dea 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -27,8 +27,6 @@ import org.apache.commons.lang3.Validate; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; -import java.util.List; - /** * Created by modmuss50 on 17/05/2016. */ diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 07bb81722..312a2e2a1 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -10,7 +10,6 @@ import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -import java.util.List; public class ItemDusts extends ItemTextureBase { public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 945d9f6d8..e015964e4 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -10,7 +10,6 @@ import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -import java.util.List; public class ItemDustsSmall extends ItemTextureBase { diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index 390ac9591..43ca5fda2 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -9,7 +9,6 @@ import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -import java.util.List; public class ItemGems extends ItemTextureBase { diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index a4ca46a3e..36f25f61b 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -9,7 +9,6 @@ import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -import java.util.List; public class ItemIngots extends ItemTextureBase { public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 9940af817..ec23a2362 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -13,7 +13,6 @@ import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -import java.util.List; public class ItemParts extends ItemTextureBase { public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit", diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 7578c163a..6bbaa3142 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -11,7 +11,6 @@ import techreborn.lib.ModInfo; import techreborn.utils.OreDictUtils; import java.security.InvalidParameterException; -import java.util.List; public class ItemPlates extends ItemTextureBase { diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index f42150fbd..c5ff01cd4 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -20,8 +20,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.lib.ModInfo; -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/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index ce1371d54..78b75f2b4 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -83,7 +83,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI } @Override - public EnumActionResult onItemUse( EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } diff --git a/src/main/java/techreborn/items/tools/ItemDebugTool.java b/src/main/java/techreborn/items/tools/ItemDebugTool.java index 7f4c2ad54..4b97af6ef 100644 --- a/src/main/java/techreborn/items/tools/ItemDebugTool.java +++ b/src/main/java/techreborn/items/tools/ItemDebugTool.java @@ -2,7 +2,6 @@ package techreborn.items.tools; import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 6ddbe02a5..d31bee5ca 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -51,7 +51,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { - if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), side))){ + if (!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), side))) { return EnumActionResult.FAIL; } if (CompatManager.isIC2Loaded) { @@ -82,7 +82,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), facing))){ + if (!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), facing))) { return EnumActionResult.FAIL; } if (CompatManager.isIC2Loaded) { diff --git a/src/main/java/techreborn/parts/StandalonePartCompact.java b/src/main/java/techreborn/parts/StandalonePartCompact.java index 814697dba..71adf252e 100644 --- a/src/main/java/techreborn/parts/StandalonePartCompact.java +++ b/src/main/java/techreborn/parts/StandalonePartCompact.java @@ -4,7 +4,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import techreborn.compat.ICompatModule; import techreborn.init.ModItems; import techreborn.parts.powerCables.ItemStandaloneCables; diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 1b4b685b2..b3faa0257 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -13,7 +13,6 @@ import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 839bc7617..8ad0e9aae 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -10,7 +10,6 @@ import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/TileEntityFlare.java b/src/main/java/techreborn/tiles/TileEntityFlare.java index 386930b53..07e59ac6e 100644 --- a/src/main/java/techreborn/tiles/TileEntityFlare.java +++ b/src/main/java/techreborn/tiles/TileEntityFlare.java @@ -21,12 +21,12 @@ public class TileEntityFlare extends TileEntity implements ITickable { @Override public void update() { EnumDyeColor color = world.getBlockState(pos).getValue(BlockFlare.COLOR); - if(world.isRemote && world.isAirBlock(getPos().up())){ - ParticleSmoke particleSmokeLarge = new ParticleSmoke(world , pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0); + if (world.isRemote && world.isAirBlock(getPos().up())) { + ParticleSmoke particleSmokeLarge = new ParticleSmoke(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0); particleSmokeLarge.setMaxAge(250); - if(color != EnumDyeColor.WHITE){ + if (color != EnumDyeColor.WHITE) { float[] rgb = EntitySheep.getDyeRgb(color); - particleSmokeLarge.setRBGColorF(rgb[0] + (random.nextFloat() /20), rgb[1] + (random.nextFloat() /20), rgb[2] + (random.nextFloat() /20)); + particleSmokeLarge.setRBGColorF(rgb[0] + (random.nextFloat() / 20), rgb[1] + (random.nextFloat() / 20), rgb[2] + (random.nextFloat() / 20)); } particleSmokeLarge.multipleParticleScaleBy(0.5F); @@ -36,5 +36,4 @@ public class TileEntityFlare extends TileEntity implements ITickable { } } - } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 06b480807..a59e19523 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntityFurnace; import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; public class TileIronFurnace extends TileLegacyMachineBase implements IInventoryProvider { diff --git a/src/main/java/techreborn/tiles/TilePump.java b/src/main/java/techreborn/tiles/TilePump.java index 097893cbc..09f7450a1 100644 --- a/src/main/java/techreborn/tiles/TilePump.java +++ b/src/main/java/techreborn/tiles/TilePump.java @@ -9,7 +9,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.EnumPowerTier; import reborncore.common.powerSystem.PowerSystem; @@ -134,7 +137,7 @@ public class TilePump extends TilePowerAcceptor { @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -142,7 +145,7 @@ public class TilePump extends TilePowerAcceptor { @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 5813532bd..b06a08d15 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -11,7 +11,6 @@ import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 8d1768c58..7e039deb0 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -12,7 +12,6 @@ import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; @@ -72,7 +71,7 @@ public class TileQuantumTank extends TileLegacyMachineBase @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -80,7 +79,7 @@ public class TileQuantumTank extends TileLegacyMachineBase @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index b5c8905c1..674506468 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.fuel.FluidPowerManager; import reborncore.api.power.EnumPowerTier; @@ -57,7 +56,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -65,7 +64,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 5b0495d29..b34bd259a 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IInventoryProvider; @@ -70,7 +69,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -78,7 +77,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index c15301559..7d00bc054 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -58,7 +58,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn updateState(); burnItem = getStackInSlot(fuelSlot); if (getStackInSlot(fuelSlot).getCount() == 1) { - if(getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket){ + if (getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket) { setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET)); } else { setInventorySlotContents(fuelSlot, ItemStack.EMPTY); diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 09504ef68..b7e611102 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IInventoryProvider; @@ -76,7 +75,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -84,7 +83,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 510dedf15..3fd980fed 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IInventoryProvider; @@ -59,7 +58,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -67,7 +66,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java index 989f6bea9..f331e0a84 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java @@ -4,7 +4,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.common.tile.TileLegacyMachineBase; -import reborncore.common.tile.TileMachineBase; public class TileLesuStorage extends TileLegacyMachineBase { diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 451bd218f..a28a01d24 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.EnumPowerTier; import reborncore.api.recipe.IRecipeCrafterProvider; @@ -26,7 +26,6 @@ import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import techreborn.init.ModFluids; import static techreborn.tiles.multiblock.MultiblockChecker.CASING_NORMAL; import static techreborn.tiles.multiblock.MultiblockChecker.CASING_REINFORCED; @@ -132,7 +131,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -140,7 +139,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 490e9cab3..7d5f003f3 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.oredict.OreDictionary; import reborncore.api.IListInfoProvider; @@ -22,7 +21,6 @@ import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.init.ModBlocks; -import techreborn.init.ModFluids; import techreborn.items.ItemDusts; import java.util.Random; @@ -153,7 +151,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } return super.hasCapability(capability, facing); @@ -161,7 +159,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) tank; } return super.getCapability(capability, facing); diff --git a/src/main/java/techreborn/utils/IC2WrenchHelper.java b/src/main/java/techreborn/utils/IC2WrenchHelper.java index 792e51199..7a825fc28 100644 --- a/src/main/java/techreborn/utils/IC2WrenchHelper.java +++ b/src/main/java/techreborn/utils/IC2WrenchHelper.java @@ -1,7 +1,5 @@ package techreborn.utils; -import ic2.api.item.IC2Items; -//import ic2.core.item.tool.ItemToolWrench; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; @@ -10,6 +8,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +//import ic2.core.item.tool.ItemToolWrench; + //TODO IC2 public class IC2WrenchHelper { @@ -17,18 +17,18 @@ public class IC2WrenchHelper { public static EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { -// if (wrench == null) { -// wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); -// } -// return wrench.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); + // if (wrench == null) { + // wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); + // } + // return wrench.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); return EnumActionResult.FAIL; } public static EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { -// if (wrench == null) { -// wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); -// } -// return wrench.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); + // if (wrench == null) { + // wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); + // } + // return wrench.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); return EnumActionResult.FAIL; } } diff --git a/src/main/java/techreborn/utils/OreDictUtils.java b/src/main/java/techreborn/utils/OreDictUtils.java index 53cc41079..8ebf14187 100644 --- a/src/main/java/techreborn/utils/OreDictUtils.java +++ b/src/main/java/techreborn/utils/OreDictUtils.java @@ -79,7 +79,9 @@ public class OreDictUtils { return isOre(new ItemStack(item), oreName); } - public static boolean isOre(@Nonnull ItemStack stack, String oreName) { + public static boolean isOre( + @Nonnull + ItemStack stack, String oreName) { if (stack != ItemStack.EMPTY && !stack.isEmpty() && oreName != null) { int id = OreDictionary.getOreID(oreName); int[] ids = OreDictionary.getOreIDs(stack); diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 66eda0af4..965e5d868 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -98,7 +98,7 @@ public class TechRebornWorldGen implements IWorldGenerator { loadFromJson(); } else { config = defaultConfig; - jsonInvalid= true; + jsonInvalid = true; } config.overworldOres.addAll(getMissingOres(config.overworldOres, defaultConfig.overworldOres)); config.neatherOres.addAll(getMissingOres(config.neatherOres, defaultConfig.neatherOres));