Auto format

This commit is contained in:
modmuss50 2016-11-25 13:25:51 +00:00
parent aceeb7a037
commit e16c3eba02
55 changed files with 128 additions and 182 deletions

View file

@ -14,7 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import org.apache.commons.lang3.time.StopWatch; import org.apache.commons.lang3.time.StopWatch;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
@ -32,7 +31,6 @@ import techreborn.compat.CompatManager;
import techreborn.compat.ICompatModule; import techreborn.compat.ICompatModule;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.dispenser.BehaviorDispenseScrapbox; import techreborn.dispenser.BehaviorDispenseScrapbox;
import techreborn.entitys.EntityNukePrimed;
import techreborn.events.BlockBreakHandler; import techreborn.events.BlockBreakHandler;
import techreborn.events.OreUnifier; import techreborn.events.OreUnifier;
import techreborn.events.TRTickHandler; import techreborn.events.TRTickHandler;

View file

@ -11,7 +11,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { 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) if (input1 != null)
inputs.add(input1); inputs.add(input1);
if (output1 != null) if (output1 != null)

View file

@ -7,7 +7,6 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -22,7 +21,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.tiles.TileEntityFlare; import techreborn.tiles.TileEntityFlare;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
/** /**

View file

@ -21,7 +21,6 @@ import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMachineCasing;
import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock { public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock {

View file

@ -17,7 +17,6 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" }; public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" };

View file

@ -10,7 +10,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -2,7 +2,6 @@ package techreborn.blocks;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;

View file

@ -65,13 +65,13 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
} }
//TODO 1.11: what is this? //TODO 1.11: what is this?
// @Override // @Override
// protected ItemStack createStackedBlock(IBlockState state) { // protected ItemStack createStackedBlock(IBlockState state) {
// IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE, // IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE,
// false); // false);
// //
// return super.createStackedBlock(newState); // return super.createStackedBlock(newState);
// } // }
@Override @Override
public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) { public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) {

View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.world.RubberTreeGenerator; import techreborn.world.RubberTreeGenerator;
import java.util.List;
import java.util.Random; import java.util.Random;
/** /**

View file

@ -16,7 +16,6 @@ import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage extends BaseBlock implements ITexturedBlock { public class BlockStorage extends BaseBlock implements ITexturedBlock {

View file

@ -17,7 +17,6 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage2 extends BaseBlock implements ITexturedBlock { public class BlockStorage2 extends BaseBlock implements ITexturedBlock {

View file

@ -3,7 +3,6 @@ package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;

View file

@ -1,7 +1,6 @@
package techreborn.client; package techreborn.client;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;

View file

@ -1,7 +1,6 @@
package techreborn.client; package techreborn.client;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.init.ModItems; import techreborn.init.ModItems;

View file

@ -1,18 +1,12 @@
package techreborn.client.container; package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer; 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.BaseSlot;
import reborncore.client.gui.slots.SlotInput; import reborncore.client.gui.slots.SlotInput;
import reborncore.client.gui.slots.SlotOutput; import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.api.gui.SlotUpgrade; import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileExtractor; import techreborn.tiles.teir1.TileExtractor;
import javax.annotation.Nullable;
import java.util.List;
public class ContainerExtractor extends ContainerCrafting { public class ContainerExtractor extends ContainerCrafting {
EntityPlayer player; EntityPlayer player;

View file

@ -1,18 +1,12 @@
package techreborn.client.container; package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer; 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.BaseSlot;
import reborncore.client.gui.slots.SlotInput; import reborncore.client.gui.slots.SlotInput;
import reborncore.client.gui.slots.SlotOutput; import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.api.gui.SlotUpgrade; import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileGrinder; import techreborn.tiles.teir1.TileGrinder;
import javax.annotation.Nullable;
import java.util.List;
public class ContainerGrinder extends ContainerCrafting { public class ContainerGrinder extends ContainerCrafting {
public int connectionStatus; public int connectionStatus;
@ -31,7 +25,6 @@ public class ContainerGrinder extends ContainerCrafting {
return true; return true;
} }
public void addInventorySlots() { public void addInventorySlots() {
// input // input
this.addSlotToContainer(new SlotInput(tile.inventory, 0, 56, 34)); this.addSlotToContainer(new SlotInput(tile.inventory, 0, 56, 34));
@ -46,7 +39,6 @@ public class ContainerGrinder extends ContainerCrafting {
addPlayerSlots(); addPlayerSlots();
} }
public void addPlayerSlots() { public void addPlayerSlots() {
int i; int i;

View file

@ -38,13 +38,13 @@ public class CompatManager {
register(RecipesIC2.class, "IC2"); register(RecipesIC2.class, "IC2");
} }
public void register(Class<? extends ICompatModule> moduleClass,Object... objs){ public void register(Class<? extends ICompatModule> moduleClass, Object... objs) {
registerCompact(moduleClass, true, objs); registerCompact(moduleClass, true, objs);
} }
public void registerCompact(Class<? extends ICompatModule> moduleClass, boolean config, Object... objs) { public void registerCompact(Class<? extends ICompatModule> moduleClass, boolean config, Object... objs) {
boolean shouldLoad = true; boolean shouldLoad = true;
if(config){ if (config) {
shouldLoad = ConfigTechReborn.config shouldLoad = ConfigTechReborn.config
.get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true, .get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true,
"Should the " + moduleClass.getSimpleName() + " be loaded?") "Should the " + moduleClass.getSimpleName() + " be loaded?")
@ -75,7 +75,7 @@ public class CompatManager {
return; return;
} }
} }
if(config){ if (config) {
if (ConfigTechReborn.config.hasChanged()) if (ConfigTechReborn.config.hasChanged())
ConfigTechReborn.config.save(); ConfigTechReborn.config.save();
if (!shouldLoad) { if (!shouldLoad) {

View file

@ -5,7 +5,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import techreborn.items.ItemGems; import techreborn.items.ItemGems;
import techreborn.items.ItemParts;
import techreborn.utils.OreDictUtils; import techreborn.utils.OreDictUtils;
/** /**

View file

@ -42,8 +42,8 @@ public class TRTickHandler {
MinecraftForge.EVENT_BUS.post(new PowerTickEvent()); MinecraftForge.EVENT_BUS.post(new PowerTickEvent());
long elapsed = System.nanoTime() - start; long elapsed = System.nanoTime() - start;
tickTime += elapsed; tickTime += elapsed;
ticksCounted ++; ticksCounted++;
if(ticksCounted == 20 * 5){ if (ticksCounted == 20 * 5) {
//Enable this this line to get some infomation when debuging. //Enable this this line to get some infomation when debuging.
//System.out.println("Average powernet tick time over last 5 seconds: " + (tickTime / ticksCounted) + "ns"); //System.out.println("Average powernet tick time over last 5 seconds: " + (tickTime / ticksCounted) + "ns");
ticksCounted = 0; ticksCounted = 0;

View file

@ -1,6 +1,5 @@
package techreborn.init; package techreborn.init;
import techreborn.Core; import techreborn.Core;
/** /**
@ -11,52 +10,52 @@ public class IC2Dict {
//TODO IC2 //TODO IC2
public static void init() { public static void init() {
try { try {
// CraftingItemType.circuit.getName(); // CraftingItemType.circuit.getName();
// //
// OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack()); // OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
// //
// OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit)); // OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
// OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit)); // OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
// //
// OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine)); // OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
// OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine)); // OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
// //
// OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack()); // OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
// OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack()); // OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
// //
// OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack()); // OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
// OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack()); // OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
// OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack()); // OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
// //
// ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt); // ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
// industrialTnt.setItemDamage(1); // industrialTnt.setItemDamage(1);
// OreDictionary.registerOre("industrialTnt", industrialTnt); // OreDictionary.registerOre("industrialTnt", industrialTnt);
// //
// OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond)); // OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
// OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff)); // OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
// OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer)); // OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
// //
// //TODO: // //TODO:
// //
// //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold)); // //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
// //
// //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator); // //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
// //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel); // //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
// //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder); // //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
// //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor); // //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
// //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill); // //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
// //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill); // //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
// //
// OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235)); // OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
// OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238)); // OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
// OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238)); // OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
// OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235)); // OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
// //
// OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron)); // OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
// OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack()); // OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
// OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced)); // OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
// //
// OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore)); // OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
} catch (NoClassDefFoundError notFound) { } catch (NoClassDefFoundError notFound) {
Core.logHelper.warn( Core.logHelper.warn(
"Can't enable integration: IC2 installed but cannot be hooked\n" + "Can't enable integration: IC2 installed but cannot be hooked\n" +

View file

@ -1,11 +1,9 @@
package techreborn.init; package techreborn.init;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemColored;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
@ -23,7 +21,6 @@ import techreborn.blocks.tier1.*;
import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer; import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.itemblocks.*; import techreborn.itemblocks.*;
import techreborn.tiles.*; import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.fusionReactor.TileEntityFusionController;
@ -384,13 +381,13 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
//TODO enable when done //TODO enable when done
// flare = new BlockFlare(); // flare = new BlockFlare();
// registerBlock(flare, "flare"); // registerBlock(flare, "flare");
// ItemBlock itemBlock = new ItemColored(flare, true); // ItemBlock itemBlock = new ItemColored(flare, true);
// itemBlock.setRegistryName("flareItemBlock"); // itemBlock.setRegistryName("flareItemBlock");
// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance); // itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance);
// GameRegistry.register(itemBlock); // GameRegistry.register(itemBlock);
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR"); // GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
registerOreDict(); registerOreDict();
Core.logHelper.info("TechReborns Blocks Loaded"); Core.logHelper.info("TechReborns Blocks Loaded");

View file

@ -453,7 +453,7 @@ public class ModRecipes {
continue; continue;
} }
dust = dust.copy(); dust = dust.copy();
if(ore){ if (ore) {
dust.setCount(2); dust.setCount(2);
} }
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
@ -1013,7 +1013,7 @@ public class ModRecipes {
"circuitBasic"); "circuitBasic");
TechRebornAPI TechRebornAPI
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil",3), "NCN", "C C", "NCN", .addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN",
'N', "ingotNickel", 'C', "ingotCopper"); 'N', "ingotNickel", 'C', "ingotCopper");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"), RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"),

View file

@ -27,8 +27,6 @@ import org.apache.commons.lang3.Validate;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import java.util.List;
/** /**
* Created by modmuss50 on 17/05/2016. * Created by modmuss50 on 17/05/2016.
*/ */

View file

@ -10,7 +10,6 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemDusts extends ItemTextureBase { public class ItemDusts extends ItemTextureBase {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",

View file

@ -10,7 +10,6 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemDustsSmall extends ItemTextureBase { public class ItemDustsSmall extends ItemTextureBase {

View file

@ -9,7 +9,6 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemGems extends ItemTextureBase { public class ItemGems extends ItemTextureBase {

View file

@ -9,7 +9,6 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemIngots extends ItemTextureBase { public class ItemIngots extends ItemTextureBase {
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",

View file

@ -13,7 +13,6 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemParts extends ItemTextureBase { public class ItemParts extends ItemTextureBase {
public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit", public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit",

View file

@ -11,7 +11,6 @@ import techreborn.lib.ModInfo;
import techreborn.utils.OreDictUtils; import techreborn.utils.OreDictUtils;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List;
public class ItemPlates extends ItemTextureBase { public class ItemPlates extends ItemTextureBase {

View file

@ -20,8 +20,6 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List;
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;

View file

@ -83,7 +83,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI
} }
@Override @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) { EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
} }

View file

@ -2,7 +2,6 @@ package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem; import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;

View file

@ -51,7 +51,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
@Override @Override
public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos,
EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { 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; return EnumActionResult.FAIL;
} }
if (CompatManager.isIC2Loaded) { if (CompatManager.isIC2Loaded) {
@ -82,7 +82,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
@Override @Override
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { 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; return EnumActionResult.FAIL;
} }
if (CompatManager.isIC2Loaded) { if (CompatManager.isIC2Loaded) {

View file

@ -4,7 +4,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import techreborn.compat.ICompatModule; import techreborn.compat.ICompatModule;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.parts.powerCables.ItemStandaloneCables; import techreborn.parts.powerCables.ItemStandaloneCables;

View file

@ -13,7 +13,6 @@ import reborncore.api.recipe.RecipeHandler;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
import techreborn.api.Reference; import techreborn.api.Reference;

View file

@ -10,7 +10,6 @@ import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;

View file

@ -21,12 +21,12 @@ public class TileEntityFlare extends TileEntity implements ITickable {
@Override @Override
public void update() { public void update() {
EnumDyeColor color = world.getBlockState(pos).getValue(BlockFlare.COLOR); EnumDyeColor color = world.getBlockState(pos).getValue(BlockFlare.COLOR);
if(world.isRemote && world.isAirBlock(getPos().up())){ 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); ParticleSmoke particleSmokeLarge = new ParticleSmoke(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0);
particleSmokeLarge.setMaxAge(250); particleSmokeLarge.setMaxAge(250);
if(color != EnumDyeColor.WHITE){ if (color != EnumDyeColor.WHITE) {
float[] rgb = EntitySheep.getDyeRgb(color); 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); particleSmokeLarge.multipleParticleScaleBy(0.5F);
@ -36,5 +36,4 @@ public class TileEntityFlare extends TileEntity implements ITickable {
} }
} }
} }

View file

@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntityFurnace;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
public class TileIronFurnace extends TileLegacyMachineBase implements IInventoryProvider { public class TileIronFurnace extends TileLegacyMachineBase implements IInventoryProvider {

View file

@ -9,7 +9,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability; 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 net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
@ -134,7 +137,7 @@ public class TilePump extends TilePowerAcceptor {
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -142,7 +145,7 @@ public class TilePump extends TilePowerAcceptor {
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -11,7 +11,6 @@ import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;

View file

@ -12,7 +12,6 @@ import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.FluidUtils; import reborncore.common.util.FluidUtils;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
@ -72,7 +71,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -80,7 +79,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.fuel.FluidPowerManager; import reborncore.api.fuel.FluidPowerManager;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
@ -57,7 +56,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -65,7 +64,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
@ -70,7 +69,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -78,7 +77,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -58,7 +58,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
updateState(); updateState();
burnItem = getStackInSlot(fuelSlot); burnItem = getStackInSlot(fuelSlot);
if (getStackInSlot(fuelSlot).getCount() == 1) { 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)); setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET));
} else { } else {
setInventorySlotContents(fuelSlot, ItemStack.EMPTY); setInventorySlotContents(fuelSlot, ItemStack.EMPTY);

View file

@ -7,7 +7,6 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
@ -76,7 +75,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -84,7 +83,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -9,7 +9,6 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
@ -59,7 +58,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -67,7 +66,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -4,7 +4,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase;
public class TileLesuStorage extends TileLegacyMachineBase { public class TileLesuStorage extends TileLegacyMachineBase {

View file

@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.recipe.IRecipeCrafterProvider;
@ -26,7 +26,6 @@ import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;
import static techreborn.tiles.multiblock.MultiblockChecker.CASING_NORMAL; import static techreborn.tiles.multiblock.MultiblockChecker.CASING_NORMAL;
import static techreborn.tiles.multiblock.MultiblockChecker.CASING_REINFORCED; import static techreborn.tiles.multiblock.MultiblockChecker.CASING_REINFORCED;
@ -132,7 +131,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -140,7 +139,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
@ -22,7 +21,6 @@ import reborncore.common.util.FluidUtils;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;
import techreborn.items.ItemDusts; import techreborn.items.ItemDusts;
import java.util.Random; import java.util.Random;
@ -153,7 +151,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true; return true;
} }
return super.hasCapability(capability, facing); return super.hasCapability(capability, facing);
@ -161,7 +159,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){ if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return (T) tank; return (T) tank;
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);

View file

@ -1,7 +1,5 @@
package techreborn.utils; package techreborn.utils;
import ic2.api.item.IC2Items;
//import ic2.core.item.tool.ItemToolWrench;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
@ -10,6 +8,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
//import ic2.core.item.tool.ItemToolWrench;
//TODO IC2 //TODO IC2
public class IC2WrenchHelper { public class IC2WrenchHelper {
@ -17,18 +17,18 @@ public class IC2WrenchHelper {
public static EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, public static EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos,
EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
// if (wrench == null) { // if (wrench == null) {
// wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); // wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem();
// } // }
// return wrench.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); // return wrench.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand);
return EnumActionResult.FAIL; 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) { 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) { // if (wrench == null) {
// wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem(); // wrench = (ItemToolWrench) IC2Items.getItem("wrench").getItem();
// } // }
// return wrench.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); // return wrench.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ);
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
} }
} }

View file

@ -79,7 +79,9 @@ public class OreDictUtils {
return isOre(new ItemStack(item), oreName); 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) { if (stack != ItemStack.EMPTY && !stack.isEmpty() && oreName != null) {
int id = OreDictionary.getOreID(oreName); int id = OreDictionary.getOreID(oreName);
int[] ids = OreDictionary.getOreIDs(stack); int[] ids = OreDictionary.getOreIDs(stack);

View file

@ -98,7 +98,7 @@ public class TechRebornWorldGen implements IWorldGenerator {
loadFromJson(); loadFromJson();
} else { } else {
config = defaultConfig; config = defaultConfig;
jsonInvalid= true; jsonInvalid = true;
} }
config.overworldOres.addAll(getMissingOres(config.overworldOres, defaultConfig.overworldOres)); config.overworldOres.addAll(getMissingOres(config.overworldOres, defaultConfig.overworldOres));
config.neatherOres.addAll(getMissingOres(config.neatherOres, defaultConfig.neatherOres)); config.neatherOres.addAll(getMissingOres(config.neatherOres, defaultConfig.neatherOres));