mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-20 12:09:41 +00:00
Fix compile errors. Read as: Tom what did you do...
This commit is contained in:
1 parent
8267617019
commit
bef1d9eb53
10 files changed
+109
-30
No files matched your search
@@ -2,7 +2,6 @@ package tombenpotter.emt.common.modules.base.blocks;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
|
||||
public class BaseBlockRegistry {
|
||||
@@ -13,7 +12,7 @@ public class BaseBlockRegistry {
|
||||
public static void registerBaseBlocks() {
|
||||
portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode");
|
||||
GameRegistry.registerBlock(portableNode, "PortableNode");
|
||||
toolRefiller = new BlockToolRefiller("toolRefiller", Material.iron, "tool_refiller", Block.soundTypeMetal, 4.0F);
|
||||
toolRefiller = new BlockToolRefiller().setBlockTextureName("tool_refiller");
|
||||
GameRegistry.registerBlock(toolRefiller, "ToolRefiller");
|
||||
}
|
||||
}
|
||||
@@ -6,8 +6,8 @@ import net.minecraft.world.World;
|
||||
|
||||
public class BlockToolRefiller extends BlockBaseContainer {
|
||||
|
||||
public BlockToolRefiller(String unlocName, Material material, SoundType soundType, float hardness) {
|
||||
super(unlocName, material, soundType, hardness);
|
||||
public BlockToolRefiller() {
|
||||
super("toolRefiller", Material.iron, soundTypeMetal, 4.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -32,6 +32,7 @@ import thaumcraft.api.crafting.ShapelessArcaneRecipe;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry;
|
||||
import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry;
|
||||
import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
@@ -290,7 +291,7 @@ public class IC2RecipeRegistry {
|
||||
|
||||
tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 4), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars);
|
||||
|
||||
portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(IC2BlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode);
|
||||
portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BaseBlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode);
|
||||
|
||||
/** IC2 Stuff related recipes **/
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry;
|
||||
import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry;
|
||||
import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
@@ -343,7 +344,7 @@ public class IC2Research {
|
||||
|
||||
if (ConfigHandler.portableNodeResarch == false) {
|
||||
text = "1";
|
||||
research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(IC2BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem();
|
||||
research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BaseBlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem();
|
||||
research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.portableNode));
|
||||
}
|
||||
|
||||
|
||||
@@ -22,9 +22,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar;
|
||||
@@ -44,12 +42,10 @@ import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSola
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockEMTSolars extends BlockBaseContainer {
|
||||
public class BlockEMTSolars extends BlockIC2Container {
|
||||
|
||||
public BlockEMTSolars() {
|
||||
super(Material.iron);
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setHardness(4.0F);
|
||||
super("solars", Material.iron, soundTypeMetal, 4.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,9 +22,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar;
|
||||
@@ -33,12 +31,10 @@ import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEar
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockEMTSolars2 extends BlockBaseContainer {
|
||||
public class BlockEMTSolars2 extends BlockIC2Container {
|
||||
|
||||
public BlockEMTSolars2() {
|
||||
super(Material.iron);
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setHardness(4.0F);
|
||||
super("solars.2", Material.iron, soundTypeMetal, 4.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-6
@@ -9,17 +9,13 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.IEssentiaContainerItem;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.generators.TileEntityEssentiaGenerator;
|
||||
|
||||
public class BlockEssentiaGenerator extends BlockBaseContainer {
|
||||
public class BlockEssentiaGenerator extends BlockIC2Container {
|
||||
|
||||
public BlockEssentiaGenerator() {
|
||||
super(Material.iron);
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setHardness(4.0F);
|
||||
super("generator.essentia", Material.iron, soundTypeMetal, 4.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-6
@@ -21,20 +21,16 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer;
|
||||
import tombenpotter.emt.common.modules.ic2.tile.generators.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockEssentiaGenerators extends BlockBaseContainer {
|
||||
public class BlockEssentiaGenerators extends BlockIC2Container {
|
||||
|
||||
public BlockEssentiaGenerators() {
|
||||
super(Material.iron);
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setHardness(4.0F);
|
||||
super("generator.essentia.2", Material.iron, soundTypeMetal, 4.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package tombenpotter.emt.common.modules.ic2.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.modules.base.tile.TileEntityEMT;
|
||||
|
||||
public class BlockIC2Container extends BlockContainer {
|
||||
|
||||
public IIcon[] top = new IIcon[16];
|
||||
public IIcon[] bottom = new IIcon[16];
|
||||
public IIcon[] side = new IIcon[16];
|
||||
public IIcon[] frontOff = new IIcon[16];
|
||||
public IIcon[] frontOn = new IIcon[16];
|
||||
|
||||
public BlockIC2Container(String unlocName, Material material, Block.SoundType soundType, float hardness) {
|
||||
super(material);
|
||||
|
||||
setBlockName(ModInformation.modid + ".module.ic2." + unlocName);
|
||||
setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
setStepSound(soundType);
|
||||
setHardness(hardness);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World var1, int var2) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) {
|
||||
TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z);
|
||||
int i = access.getBlockMetadata(x, y, z);
|
||||
|
||||
if (side == 0) {
|
||||
return this.bottom[i];
|
||||
} else if (side == 1) {
|
||||
return this.top[i];
|
||||
} else if (side != tile.facing) {
|
||||
return this.side[i];
|
||||
} else if (tile.isOn) {
|
||||
return this.frontOn[i];
|
||||
} else {
|
||||
return this.frontOff[i];
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
if (side < 1) {
|
||||
return this.bottom[meta];
|
||||
}
|
||||
if (side == 1) {
|
||||
return this.top[meta];
|
||||
}
|
||||
if (side == 3) {
|
||||
return this.frontOff[meta];
|
||||
}
|
||||
return this.side[meta];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) {
|
||||
int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
|
||||
TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z);
|
||||
|
||||
if (facing == 0)
|
||||
tile.facing = 2;
|
||||
else if (facing == 1)
|
||||
tile.facing = 5;
|
||||
else if (facing == 2)
|
||||
tile.facing = 3;
|
||||
else if (facing == 3)
|
||||
tile.facing = 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(int meta) {
|
||||
return meta;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user