Energy storages item charging fixes, transformers fixes, electric items fixes.

This commit is contained in:
Dragon2488 2016-07-25 15:10:55 +07:00
parent b42b5274b5
commit be4f10b975
63 changed files with 2154 additions and 2123 deletions

View file

@ -55,6 +55,7 @@ import techreborn.blocks.tier1.BlockElectricFurnace;
import techreborn.blocks.tier1.BlockExtractor;
import techreborn.blocks.tier1.BlockGrinder;
import techreborn.blocks.tier1.BlockRecycler;
import techreborn.blocks.transformers.BlockEVTransformer;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
@ -85,6 +86,7 @@ import techreborn.tiles.teir1.TileElectricFurnace;
import techreborn.tiles.teir1.TileExtractor;
import techreborn.tiles.teir1.TileGrinder;
import techreborn.tiles.teir1.TileRecycler;
import techreborn.tiles.transformers.TileEVTransformer;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.tiles.transformers.TileLVTransformer;
import techreborn.tiles.transformers.TileMVTransformer;
@ -147,10 +149,12 @@ public class ModBlocks
public static Block mfe;
public static Block mfsu;
public static Block scrapboxinator;
public static Block pump;
public static Block lvt;
public static Block mvt;
public static Block hvt;
public static Block pump;
public static Block evt;
public static BlockOre ore;
public static BlockOre2 ore2;
@ -437,7 +441,11 @@ public class ModBlocks
distributor = new BlockDistributor();
registerBlock(distributor, "distributor");
registerOreDict();
evt = new BlockEVTransformer();
registerBlock(evt, "evt");
GameRegistry.registerTileEntity(TileEVTransformer.class, "TileEVTransformer");
registerOreDict();
Core.logHelper.info("TechReborns Blocks Loaded");
}

View file

@ -1,21 +1,16 @@
package techreborn.init;
import net.minecraft.init.Items;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.BucketHandler;
import techreborn.Core;
import techreborn.api.Reference;
import techreborn.blocks.BlockMachineFrame;
import techreborn.config.ConfigTechReborn;
import techreborn.events.OreUnifier;
import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack;
@ -141,51 +136,51 @@ public class ModItems
parts = new ItemParts();
registerItem(parts, "part");
rockCutter = PoweredItem.createItem(ItemRockCutter.class);
rockCutter = new ItemRockCutter();
registerItem(rockCutter, "rockCutter");
lithiumBatpack = PoweredItem.createItem(ItemLithiumBatpack.class);
lithiumBatpack = new ItemLithiumBatpack();
registerItem(lithiumBatpack, "lithiumBatpack");
lapotronpack = PoweredItem.createItem(ItemLapotronPack.class);
lapotronpack = new ItemLapotronPack();
registerItem(lapotronpack, "lapotronPack");
lithiumBattery = PoweredItem.createItem(ItemLithiumBattery.class);
lithiumBattery = new ItemLithiumBattery();
registerItem(lithiumBattery, "lithiumBattery");
lapotronicOrb = PoweredItem.createItem(ItemLapotronicOrb.class);
lapotronicOrb = new ItemLapotronicOrb();
registerItem(lapotronicOrb, "lapotronicOrb");
omniTool = PoweredItem.createItem(ItemOmniTool.class);
omniTool = new ItemOmniTool();
registerItem(omniTool, "omniTool");
energyCrystal = PoweredItem.createItem(ItemEnergyCrystal.class);
energyCrystal = new ItemEnergyCrystal();
registerItem(energyCrystal, "energycrystal");
lapotronCrystal = PoweredItem.createItem(ItemLapotronCrystal.class);
lapotronCrystal = new ItemLapotronCrystal();
registerItem(lapotronCrystal, "lapotroncrystal");
manual = new ItemTechManual();
registerItem(manual, "techmanuel");
uuMatter = new ItemUUmatter();
registerItem(uuMatter, "uumatter");
reBattery = PoweredItem.createItem(ItemReBattery.class);
reBattery = new ItemReBattery();
registerItem(reBattery, "rebattery");
treeTap = new ItemTreeTap();
registerItem(treeTap, "treetap");
ironDrill = PoweredItem.createItem(ItemSteelDrill.class);
ironDrill = new ItemSteelDrill();
registerItem(ironDrill, "irondrill");
diamondDrill = PoweredItem.createItem(ItemDiamondDrill.class);
diamondDrill = new ItemDiamondDrill();
registerItem(diamondDrill, "diamonddrill");
advancedDrill = PoweredItem.createItem(ItemAdvancedDrill.class);
advancedDrill = new ItemAdvancedDrill();
registerItem(advancedDrill, "advanceddrill");
ironChainsaw = PoweredItem.createItem(ItemSteelChainsaw.class);
ironChainsaw = new ItemSteelChainsaw();
registerItem(ironChainsaw, "ironchainsaw");
diamondChainsaw = PoweredItem.createItem(ItemDiamondChainsaw.class);
diamondChainsaw = new ItemDiamondChainsaw();
registerItem(diamondChainsaw, "diamondchainsaw");
advancedChainsaw = PoweredItem.createItem(ItemAdvancedChainsaw.class);
advancedChainsaw = new ItemAdvancedChainsaw();
registerItem(advancedChainsaw, "advancedchainsaw");
steelJackhammer = PoweredItem.createItem(ItemSteelJackhammer.class);
steelJackhammer = new ItemSteelJackhammer();
registerItem(steelJackhammer, "steeljackhammer");
diamondJackhammer = PoweredItem.createItem(ItemDiamondJackhammer.class);
diamondJackhammer = new ItemDiamondJackhammer();
registerItem(diamondJackhammer, "diamondjackhammer");
advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class);
advancedJackhammer = new ItemAdvancedJackhammer();
registerItem(advancedJackhammer, "ironjackhammer");
if(ConfigTechReborn.enableGemArmorAndTools){
@ -274,7 +269,7 @@ public class ModItems
wrench = new ItemWrench();
registerItem(wrench, "wrench");
nanosaber = PoweredItem.createItem(ItemNanosaber.class);
nanosaber = new ItemNanosaber();
registerItem(nanosaber, "nanosaber");
scrapBox = new ItemScrapBox();
@ -286,7 +281,7 @@ public class ModItems
upgrades = new ItemUpgrades();
registerItem(upgrades, "upgrades");
cloakingDevice = PoweredItem.createItem(ItemCloakingDevice.class);
cloakingDevice = new ItemCloakingDevice();
registerItem(cloakingDevice, "cloakingdevice");
missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");