mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-22 04:52:18 +00:00
Cleanup, libs.
This commit is contained in:
1 parent
277677837e
commit
9e39c63627
43 files changed
+89
-99
No files matched your search
@@ -19,8 +19,8 @@ import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import tombenpotter.emt.common.commands.CommandOutputs;
|
||||
import tombenpotter.emt.common.Registry;
|
||||
import tombenpotter.emt.common.entities.BaseEntityRegistry;
|
||||
import tombenpotter.emt.common.init.EntityRegistry;
|
||||
import tombenpotter.emt.common.init.Registry;
|
||||
import tombenpotter.emt.common.network.PacketEMTKeys;
|
||||
import tombenpotter.emt.common.util.*;
|
||||
import tombenpotter.emt.proxies.CommonProxy;
|
||||
@@ -65,7 +65,7 @@ public class ElectroMagicTools {
|
||||
DungeonChestGenerator.generateLoot();
|
||||
|
||||
ElectroMagicTools.logger.info("Registering entities");
|
||||
BaseEntityRegistry.registerEMTEntities();
|
||||
EntityRegistry.registerEMTEntities();
|
||||
ElectroMagicTools.logger.info("Registering the GUI Handler");
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy);
|
||||
|
||||
|
||||
+3
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -8,6 +8,8 @@ import tombenpotter.emt.common.blocks.BlockEMTSolars;
|
||||
import tombenpotter.emt.common.blocks.BlockEMTSolars2;
|
||||
import tombenpotter.emt.common.blocks.BlockEssentiaGenerator;
|
||||
import tombenpotter.emt.common.blocks.BlockEssentiaGenerators;
|
||||
import tombenpotter.emt.common.blocks.BlockPortableNode;
|
||||
import tombenpotter.emt.common.blocks.BlockShield;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTMachines;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars2;
|
||||
+6
-5
@@ -1,13 +1,14 @@
|
||||
package tombenpotter.emt.common.entities;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityList.EntityEggInfo;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.entities.EntityArcher;
|
||||
import tombenpotter.emt.common.entities.EntityLaser;
|
||||
|
||||
public class BaseEntityRegistry {
|
||||
public class EntityRegistry {
|
||||
|
||||
private static int startEID = 300;
|
||||
private static int entityIDs = 0;
|
||||
@@ -30,8 +31,8 @@ public class BaseEntityRegistry {
|
||||
|
||||
public static void registerEMTEntities() {
|
||||
|
||||
EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685);
|
||||
}
|
||||
}
|
||||
+9
-2
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
import ic2.core.init.InternalName;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -11,6 +11,10 @@ import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.items.ItemElectricScribingTools;
|
||||
import tombenpotter.emt.common.items.ItemIC2Baubles;
|
||||
import tombenpotter.emt.common.items.ItemMaterials;
|
||||
import tombenpotter.emt.common.items.ItemOneRing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing;
|
||||
import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller;
|
||||
@@ -28,7 +32,10 @@ import tombenpotter.emt.common.items.foci.ItemChristmasFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemExplosionFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemShieldFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemWandChargingFocus;
|
||||
import tombenpotter.emt.common.items.tools.*;
|
||||
import tombenpotter.emt.common.items.tools.ItemElectricHoeGrowth;
|
||||
import tombenpotter.emt.common.items.tools.ItemElectricThorHammer;
|
||||
import tombenpotter.emt.common.items.tools.ItemThorHammer;
|
||||
import tombenpotter.emt.common.items.tools.ItemThorHammerBroken;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemDiamondChainsaw;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemStreamChainsaw;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemThaumiumChainsaw;
|
||||
+1
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -22,9 +22,6 @@ import thaumcraft.api.crafting.ShapelessArcaneRecipe;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.CraftingAspects;
|
||||
import tombenpotter.emt.common.util.RandomHelper;
|
||||
+1
-6
@@ -1,9 +1,4 @@
|
||||
package tombenpotter.emt.common;
|
||||
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.RecipeRegistry;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.tile.TileRegistry;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
public class Registry{
|
||||
public static void register(){
|
||||
+4
-1
@@ -1,5 +1,8 @@
|
||||
package tombenpotter.emt.common.tile;
|
||||
package tombenpotter.emt.common.init;
|
||||
|
||||
import tombenpotter.emt.common.tile.TileEntityEtherealMacerator;
|
||||
import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge;
|
||||
import tombenpotter.emt.common.tile.TileEntityPortableNode;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator;
|
||||
+30
-40
@@ -33,7 +33,7 @@ import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.model.ModelCpecialArmor;
|
||||
import tombenpotter.emt.client.model.ModelWings;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemNanoWing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
@@ -131,20 +131,20 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
}
|
||||
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
|
||||
NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(itemStack);
|
||||
NBTTagCompound nbt = StackUtil.getOrCreateNbtData(itemStack);
|
||||
|
||||
byte toggleTimer = nbtData.getByte("toggleTimer");
|
||||
byte toggleTimer = nbt.getByte("toggleTimer");
|
||||
boolean ret = false;
|
||||
|
||||
boolean jetpack = nbtData.getBoolean("jetpack");
|
||||
boolean hoverMode = nbtData.getBoolean("hoverMode");
|
||||
boolean jetpack = nbt.getBoolean("jetpack");
|
||||
boolean hoverMode = nbt.getBoolean("hoverMode");
|
||||
boolean jetpackUsed = false;
|
||||
String useother = nbtData.getString("useother");
|
||||
String useother = nbt.getString("useother");
|
||||
|
||||
if(!world.isRemote){
|
||||
|
||||
if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){
|
||||
nbtData.setString("useother", "None");
|
||||
nbt.setString("useother", "None");
|
||||
}
|
||||
|
||||
if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) {
|
||||
@@ -152,7 +152,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
hoverMode = !hoverMode;
|
||||
if (IC2.platform.isSimulating())
|
||||
{
|
||||
nbtData.setBoolean("hoverMode", hoverMode);
|
||||
nbt.setBoolean("hoverMode", hoverMode);
|
||||
if (hoverMode)
|
||||
{
|
||||
IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]);
|
||||
@@ -165,57 +165,57 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
|
||||
if(player.inventory.getCurrentItem() != null && player.isSneaking() && toggleTimer == 0 && useother.equals("None")){
|
||||
if(player.inventory.getCurrentItem().getItem() == IC2Items.getItem("electricJetpack").getItem()){
|
||||
nbtData.setBoolean("jetpack", true);
|
||||
nbt.setBoolean("jetpack", true);
|
||||
IC2.platform.messagePlayer(player, "Jetpack enabled.", new Object[0]);
|
||||
|
||||
nbtData.setString("useother", "Jetpack");
|
||||
nbt.setString("useother", "Jetpack");
|
||||
int charge = (int)ElectricItem.manager.getCharge(itemStack);
|
||||
if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000){
|
||||
ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
|
||||
}
|
||||
nbtData.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
nbt.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
|
||||
}
|
||||
|
||||
else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing){
|
||||
IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW");
|
||||
nbt.setString("useother", "TW");
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
}
|
||||
|
||||
else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing){
|
||||
IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW");
|
||||
nbt.setString("useother", "NW");
|
||||
int charge = (int)ElectricItem.manager.getCharge(itemStack);
|
||||
if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemNanoWing.maxCharge){
|
||||
ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
|
||||
}
|
||||
nbtData.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
nbt.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
}
|
||||
|
||||
else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing){
|
||||
IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW");
|
||||
nbt.setString("useother", "QW");
|
||||
int charge = (int)ElectricItem.manager.getCharge(itemStack);
|
||||
if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemQuantumWing.maxCharge){
|
||||
ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
|
||||
}
|
||||
nbtData.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
nbt.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
}
|
||||
}
|
||||
|
||||
if(player.inventory.getCurrentItem() == null && player.inventory.armorInventory[2] == itemStack && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){
|
||||
if(player.inventory.getCurrentItem() == null && nbt.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){
|
||||
toggleTimer = 30;
|
||||
|
||||
if(useother.equals("Jetpack")){
|
||||
IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
|
||||
nbt.setString("useother", "None");
|
||||
ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem());
|
||||
if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), 1, true, false);
|
||||
if(nbt.getInteger("jetpackCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, nbt.getInteger("jetpackCharge"), 1, true, false);
|
||||
else
|
||||
ElectricItem.manager.charge(charged, 0, 1, true, false);
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
|
||||
@@ -223,16 +223,16 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
|
||||
if(useother.equals("TW")){
|
||||
IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
|
||||
nbt.setString("useother", "None");
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing));
|
||||
}
|
||||
|
||||
if(useother.equals("NW")){
|
||||
IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
|
||||
nbt.setString("useother", "None");
|
||||
ItemStack charged = new ItemStack(ItemRegistry.nanoWing);
|
||||
if(nbtData.getInteger("NWCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), 3, true, false);
|
||||
if(nbt.getInteger("NWCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, nbt.getInteger("NWCharge"), 3, true, false);
|
||||
else
|
||||
ElectricItem.manager.charge(charged, 0, 3, true, false);
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
|
||||
@@ -240,16 +240,16 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
|
||||
if(useother.equals("QW")){
|
||||
IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]);
|
||||
player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
|
||||
nbt.setString("useother", "None");
|
||||
ItemStack charged = new ItemStack(ItemRegistry.quantumWing);
|
||||
if(nbtData.getInteger("QWCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), 3, true, false);
|
||||
if(nbt.getInteger("QWCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, nbt.getInteger("QWCharge"), 3, true, false);
|
||||
else
|
||||
ElectricItem.manager.charge(charged, 0, 3, true, false);
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
|
||||
}
|
||||
|
||||
nbtData.setBoolean("unequip", false);
|
||||
nbt.setBoolean("unequip", false);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -268,7 +268,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
|
||||
if ((IC2.platform.isSimulating()) && (toggleTimer > 0)) {
|
||||
toggleTimer = (byte) (toggleTimer - 1);
|
||||
nbtData.setByte("toggleTimer", toggleTimer);
|
||||
nbt.setByte("toggleTimer", toggleTimer);
|
||||
}
|
||||
if ((IC2.platform.isRendering()) && (player == IC2.platform.getPlayerInstance())) {
|
||||
if (lastJetpackUsed != jetpackUsed) {
|
||||
@@ -389,16 +389,6 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
try{
|
||||
String useother = stack.stackTagCompound.getString("useother");
|
||||
list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + tier);
|
||||
//list.add(ElectricItem.manager.getCharge(stack) + " EU");
|
||||
//if(useother.equals("Jetpack")){
|
||||
// list.add(stack.stackTagCompound.getInteger("jetpackCharge") + " EU JETPACK");
|
||||
//}
|
||||
//if(useother.equals("NW")){
|
||||
// list.add(stack.stackTagCompound.getInteger("NWCharge") + " EU NW");
|
||||
//}
|
||||
//if(useother.equals("QW")){
|
||||
// list.add(stack.stackTagCompound.getInteger("QWCharge") + " EU QW");
|
||||
//}
|
||||
}
|
||||
catch(NullPointerException e){}
|
||||
}
|
||||
@@ -406,7 +396,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
public boolean useJetpack(EntityPlayer player, boolean hoverMode, ItemStack stack) {
|
||||
int jetpackMaxCharge = 30000;
|
||||
|
||||
ItemStack jetpack = player.inventory.armorInventory[2];
|
||||
ItemStack jetpack = stack;
|
||||
if (ElectricItem.manager.getCharge(stack) <= 0)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
|
||||
public class ItemShieldFocus extends ItemBaseFocus {
|
||||
int y1 = 0;
|
||||
|
||||
+1
-1
@@ -8,6 +8,7 @@ import ic2.core.IC2;
|
||||
import ic2.core.audio.AudioSource;
|
||||
import ic2.core.audio.PositionSpec;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -35,7 +36,6 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
public int hitCost = 300;
|
||||
public int tier = 2;
|
||||
public static AudioSource audio;
|
||||
int tick;
|
||||
|
||||
public ItemDiamondChainsaw() {
|
||||
super(ToolMaterial.EMERALD);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tombenpotter.emt.common.network;
|
||||
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
|
||||
@@ -13,8 +13,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.TileEntityEMT;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable {
|
||||
|
||||
@@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air;
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air;
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleAirSolar extends TileEntityAirSolar {
|
||||
|
||||
@@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air;
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleAirSolar extends TileEntityAirSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleDarkSolar extends TileEntityDarkSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar {
|
||||
|
||||
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleEarthSolar extends TileEntityEarthSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleFireSolar extends TileEntityFireSolar {
|
||||
|
||||
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleFireSolar extends TileEntityFireSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar {
|
||||
|
||||
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleOrderSolar extends TileEntityOrderSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class TileEntityTripleWaterSolar extends TileEntityWaterSolar {
|
||||
|
||||
@@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package tombenpotter.emt.common.util;
|
||||
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
|
||||
public class CreativeTabEMT extends CreativeTabs {
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package tombenpotter.emt.common.util;
|
||||
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
|
||||
public class DungeonChestGenerator {
|
||||
|
||||
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common;
|
||||
package tombenpotter.emt.common.util;
|
||||
|
||||
import ic2.api.item.IC2Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -8,9 +8,9 @@ import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import tombenpotter.emt.client.EMTKeys;
|
||||
import tombenpotter.emt.common.RecipeRegistry;
|
||||
import tombenpotter.emt.common.blocks.BlockRegistry;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import tombenpotter.emt.common.init.RecipeRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTResearchItem;
|
||||
import tombenpotter.emt.common.util.ResearchAspects;
|
||||
@@ -16,7 +16,7 @@ import thaumcraft.common.entities.monster.EntityTaintChicken;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.EMTKeys;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import tombenpotter.emt.common.network.PacketEMTKeys;
|
||||
import tombenpotter.emt.proxies.ClientProxy;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package tombenpotter.emt.common.util;
|
||||
|
||||
import ic2.api.item.ElectricItem;
|
||||
import tombenpotter.emt.common.items.ItemRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package tombenpotter.emt.common.util;
|
||||
|
||||
import tombenpotter.emt.common.EMTResearch;
|
||||
|
||||
|
||||
public class RegistryHandler {
|
||||
|
||||
public static void registerIc2PostRegistrys() {
|
||||
|
||||
Reference in new issue
Block a user