# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
modmuss50 2017-06-14 23:30:35 +01:00
commit 426001251f
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
123 changed files with 1469 additions and 1486 deletions

View file

@ -27,15 +27,18 @@ package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
public class BlockFusionCoil extends Block {
public BlockFusionCoil(Material material) {
public BlockFusionCoil() {
super(Material.IRON);
setHardness(2f);
setSoundType(SoundType.METAL);
setUnlocalizedName("techreborn.fusioncoil");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
}

View file

@ -24,33 +24,35 @@
package techreborn.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.lib.ModInfo;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.utils.damageSources.FusionDamageSource;
public class BlockFusionControlComputer extends BlockMachineBase {
public BlockFusionControlComputer(final Material material) {
public BlockFusionControlComputer() {
super();
this.setUnlocalizedName("techreborn.fusioncontrolcomputer");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
final TileEntityFusionController tileEntityFusionController = (TileEntityFusionController) world
final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world
.getTileEntity(new BlockPos(x, y, z));
tileEntityFusionController.checkCoils();
tileFusionControlComputer.checkCoils();
if (!player.isSneaking())
player.openGui(Core.INSTANCE, EGui.FUSION_CONTROLLER.ordinal(), world, x, y, z);
return true;
@ -59,9 +61,9 @@ public class BlockFusionControlComputer extends BlockMachineBase {
@Override
public void onEntityWalk(final World worldIn, final BlockPos pos, final Entity entityIn) {
super.onEntityWalk(worldIn, pos, entityIn);
if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController) {
if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0
&& ((TileEntityFusionController) worldIn.getTileEntity(pos)).checkCoils()) {
if (worldIn.getTileEntity(pos) instanceof TileFusionControlComputer) {
if (((TileFusionControlComputer) worldIn.getTileEntity(pos)).crafingTickTime != 0
&& ((TileFusionControlComputer) worldIn.getTileEntity(pos)).checkCoils()) {
entityIn.attackEntityFrom(new FusionDamageSource(), 200F);
}
}
@ -69,6 +71,6 @@ public class BlockFusionControlComputer extends BlockMachineBase {
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileEntityFusionController();
return new TileFusionControlComputer();
}
}

View file

@ -25,8 +25,8 @@
package techreborn.blocks;
import com.google.common.base.CaseFormat;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -39,7 +39,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.PropertyString;
import reborncore.common.multiblock.BlockMultiblockBase;
import reborncore.common.util.ArrayUtils;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
@ -47,22 +49,26 @@ import techreborn.lib.ModInfo;
import techreborn.tiles.TileMachineCasing;
import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random;
public class BlockMachineCasing extends BlockMultiblockBase {
public static final String[] types = new String[] { "standard", "reinforced", "advanced" };
public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length);
public static final PropertyString TYPE = new PropertyString("type", types);
private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public BlockMachineCasing() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2F);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
if (Core.proxy.isCTMAvailable()) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure/ctm"));
} else {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure"));
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard"));
for (int i = 0; i > types.length; i++) {
if (Core.proxy.isCTMAvailable()) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure/ctm").setInvVariant(types[i]));
} else {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant(types[i]));
}
}
}
@ -82,16 +88,19 @@ public class BlockMachineCasing extends BlockMultiblockBase {
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(METADATA, meta);
if (meta > types.length) {
meta = 0;
}
return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(METADATA);
return typesList.indexOf(state.getValue(TYPE));
}
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, METADATA);
return new BlockStateContainer(this, TYPE);
}
public int getHeatFromState(IBlockState state) {

View file

@ -25,8 +25,8 @@
package techreborn.blocks;
import com.google.common.base.CaseFormat;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -34,26 +34,45 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class BlockMachineFrame extends BaseBlock {
public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" };
public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length - 1);
public class BlockMachineFrames extends BaseBlock {
public static final String[] types = new String[] { "basic", "advanced", "highly_advanced" };
public static final PropertyString TYPE = new PropertyString("type", types);
private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public BlockMachineFrame(Material material) {
super(material);
setUnlocalizedName("techreborn.machineFrame");
public BlockMachineFrames() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(1f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "basic"));
for (int i = 0; i > types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant(types[i]));
}
}
public static ItemStack getFrameByName(String name, int count) {
name = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name);
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
if (name.equals("machine")) {
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0);
}
if (name.equals("advanced_machine")) {
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1);
}
if (name.equals("highly_advanced_machine")) {
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1);
}
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i);
@ -80,17 +99,20 @@ public class BlockMachineFrame extends BaseBlock {
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(METADATA);
}
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, METADATA);
public IBlockState getStateFromMeta(int meta) {
if (meta > types.length) {
meta = 0;
}
return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(METADATA, meta);
public int getMetaFromState(IBlockState state) {
return typesList.indexOf(state.getValue(TYPE));
}
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, TYPE);
}
}

View file

@ -80,7 +80,7 @@ public class BlockOre extends Block implements IOreNameProvider {
setHarvestLevel("pickaxe", 2);
this.setDefaultState(this.getStateFromMeta(0));
for (int i = 0; i < ores.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + ores[i]).setFileName("ores"));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores"));
}
}

View file

@ -64,7 +64,7 @@ public class BlockOre2 extends Block implements IOreNameProvider {
setHarvestLevel("pickaxe", 1);
this.setDefaultState(this.getStateFromMeta(0));
for (int i = 0; i < ores.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + ores[i]).setFileName("ores"));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores"));
}
}

View file

@ -37,6 +37,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
@ -52,6 +53,7 @@ import reborncore.common.util.ArrayUtils;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.MessageIDs;
import techreborn.lib.ModInfo;
import techreborn.tiles.TilePlayerDectector;
@ -75,6 +77,11 @@ public class BlockPlayerDetector extends BlockMachineBase {
}
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, typeNamesList.indexOf(state.getValue(TYPE)));
}
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(this);

View file

@ -27,16 +27,19 @@ package techreborn.blocks;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.material.Material;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
public class BlockIronFence extends BlockFence {
public class BlockRefinedIronFence extends BlockFence {
public BlockIronFence() {
public BlockRefinedIronFence() {
super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor());
setUnlocalizedName("techreborn.ironfence");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0F);
setHarvestLevel("pickaxe", 2);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
}

View file

@ -29,16 +29,19 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
public class BlockReinforcedGlass extends BaseBlock {
public BlockReinforcedGlass(Material materialIn) {
super(materialIn);
setUnlocalizedName("techreborn.reinforcedglass");
public BlockReinforcedGlass() {
super(Material.GLASS);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(4.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
@Override

View file

@ -37,8 +37,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.util.List;
import java.util.Random;
@ -50,11 +53,11 @@ public class BlockRubberLeaves extends BlockLeaves {
public BlockRubberLeaves() {
super();
setUnlocalizedName("techreborn.rubberleaves");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, true));
Blocks.FIRE.setFireInfo(this, 30, 60);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
@Override

View file

@ -41,12 +41,15 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModSounds;
import techreborn.items.ItemParts;
import techreborn.items.tools.ItemElectricTreetap;
import techreborn.items.tools.ItemTreeTap;
import techreborn.lib.ModInfo;
import java.util.ArrayList;
import java.util.List;
@ -62,7 +65,6 @@ public class BlockRubberLog extends Block {
public BlockRubberLog() {
super(Material.WOOD);
setUnlocalizedName("techreborn.rubberlog");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F);
this.setDefaultState(
@ -70,6 +72,7 @@ public class BlockRubberLog extends Block {
this.setTickRandomly(true);
this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 5);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
protected BlockStateContainer createBlockState() {

View file

@ -28,7 +28,10 @@ import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
/**
* Created by modmuss50 on 20/02/2016.
@ -37,10 +40,10 @@ public class BlockRubberPlank extends Block {
public BlockRubberPlank() {
super(Material.WOOD);
setUnlocalizedName("techreborn.rubberplank");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
}

View file

@ -32,7 +32,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
import techreborn.world.RubberTreeGenerator;
import java.util.Random;
@ -43,10 +46,10 @@ import java.util.Random;
public class BlockRubberSapling extends BlockSapling {
public BlockRubberSapling() {
setUnlocalizedName("techreborn.rubbersapling");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
setSoundType(SoundType.PLANT);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
@Override

View file

@ -24,8 +24,8 @@
package techreborn.blocks;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -37,25 +37,29 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.util.List;
import java.util.Random;
public class BlockStorage extends BaseBlock {
public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass",
"lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" };
public PropertyInteger METADATA;
public static final PropertyString TYPE = new PropertyString("type", types);
private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public BlockStorage() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "silver"));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage"));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage"));
}
}
@ -95,18 +99,16 @@ public class BlockStorage extends BaseBlock {
if (meta > types.length) {
meta = 0;
}
return this.getDefaultState().withProperty(METADATA, meta);
return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(METADATA);
return typesList.indexOf(state.getValue(TYPE));
}
protected BlockStateContainer createBlockState() {
METADATA = PropertyInteger.create("type", 0, types.length - 1);
return new BlockStateContainer(this, METADATA);
return new BlockStateContainer(this, TYPE);
}
}

View file

@ -24,8 +24,9 @@
package techreborn.blocks;
import com.google.common.base.CaseFormat;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -37,31 +38,36 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random;
public class BlockStorage2 extends BaseBlock {
public static final String[] types = new String[] { "tungstensteel",
"iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot",
"yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" };
public PropertyInteger METADATA;
"yellow_garnet", "red_garnet", "copper", "tin", "refined_iron" };
public static final PropertyString TYPE = new PropertyString("type", types);
private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public BlockStorage2() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "tungstensteel"));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage"));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage"));
}
}
public static ItemStack getStorageBlockByName(String name, int count) {
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
for (int i = 0; i < types.length; i++) {
if (types[i].equals(name)) {
return new ItemStack(ModBlocks.STORAGE2, count, i);
@ -93,18 +99,16 @@ public class BlockStorage2 extends BaseBlock {
if (meta > types.length) {
meta = 0;
}
return this.getDefaultState().withProperty(METADATA, meta);
return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(METADATA);
return typesList.indexOf(state.getValue(TYPE));
}
protected BlockStateContainer createBlockState() {
METADATA = PropertyInteger.create("type", 0, types.length - 1);
return new BlockStateContainer(this, METADATA);
return new BlockStateContainer(this, TYPE);
}
}

View file

@ -25,14 +25,17 @@
package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
public class BlockDistillationTower extends BlockMachineBase {
public BlockDistillationTower(Material material) {
public BlockDistillationTower() {
super();
setUnlocalizedName("techreborn.distillationtower");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
}

View file

@ -24,22 +24,24 @@
package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileIndustrialElectrolyzer;
public class BlockIndustrialElectrolyzer extends BlockMachineBase {
public BlockIndustrialElectrolyzer(final Material material) {
public BlockIndustrialElectrolyzer() {
super();
this.setUnlocalizedName("techreborn.industrialelectrolyzer");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,23 +24,25 @@
package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
public class BlockIndustrialSawmill extends BlockMachineBase {
public BlockIndustrialSawmill(final Material material) {
public BlockIndustrialSawmill() {
super();
this.setUnlocalizedName("techreborn.industrialsawmill");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@Override

View file

@ -27,25 +27,28 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileCreativePanel;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileCreativeSolarPanel;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class BlockCreativePanel extends BaseTileBlock {
public class BlockCreativeSolarPanel extends BaseTileBlock {
public BlockCreativePanel() {
public BlockCreativeSolarPanel() {
super(Material.IRON);
setUnlocalizedName("techreborn.creativepanel");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileCreativePanel();
return new TileCreativeSolarPanel();
}
}

View file

@ -24,23 +24,25 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileDieselGenerator;
public class BlockDieselGenerator extends BlockMachineBase {
public BlockDieselGenerator(final Material material) {
public BlockDieselGenerator() {
super();
this.setUnlocalizedName("techreborn.dieselgenerator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -24,29 +24,31 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDragonEggSiphoner;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileDragonEggSyphon;
import java.util.List;
public class BlockDragonEggSiphoner extends BlockMachineBase {
public class BlockDragonEggSyphon extends BlockMachineBase {
public BlockDragonEggSiphoner(Material material) {
public BlockDragonEggSyphon() {
super();
setUnlocalizedName("techreborn.dragoneggsiphoner");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileDragonEggSiphoner();
return new TileDragonEggSyphon();
}
@Override

View file

@ -29,18 +29,21 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileGasTurbine;
public class BlockGasTurbine extends BlockMachineBase {
public BlockGasTurbine(final Material material) {
public BlockGasTurbine() {
super();
this.setUnlocalizedName("techreborn.gasTurbine");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -24,24 +24,21 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileHeatGenerator;
import java.util.List;
public class BlockHeatGenerator extends BlockMachineBase {
public BlockHeatGenerator(Material material) {
public BlockHeatGenerator() {
super();
setUnlocalizedName("techreborn.heatgenerator");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -24,19 +24,21 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileLightningRod;
public class BlockLightningRod extends BlockMachineBase {
public BlockLightningRod(Material material) {
public BlockLightningRod() {
super();
setUnlocalizedName("techreborn.lightningrod");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -24,16 +24,18 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
public class BlockMagicEnergyAbsorber extends BlockMachineBase {
public BlockMagicEnergyAbsorber(Material material) {
public BlockMagicEnergyAbsorber() {
super();
setUnlocalizedName("techreborn.magicenergyabsorber");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
}

View file

@ -24,15 +24,17 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
public class BlockMagicEnergyConverter extends BlockMachineBase {
public BlockMagicEnergyConverter(Material material) {
public BlockMagicEnergyConverter() {
super();
setUnlocalizedName("techreborn.magicenergyconverter");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
}

View file

@ -24,28 +24,30 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileSemifluidGenerator;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSemiFluidGenerator;
public class BlockSemiFluidGenerator extends BlockMachineBase {
public BlockSemiFluidGenerator(final Material material) {
public BlockSemiFluidGenerator() {
super();
this.setUnlocalizedName("techreborn.semifluidgenerator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileSemifluidGenerator();
return new TileSemiFluidGenerator();
}
@Override

View file

@ -34,8 +34,11 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSolarPanel;
/**
@ -44,14 +47,13 @@ import techreborn.tiles.generator.TileSolarPanel;
public class BlockSolarPanel extends BaseTileBlock {
public static PropertyBool ACTIVE = PropertyBool.create("active");
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockSolarPanel() {
super(Material.IRON);
setUnlocalizedName("techreborn.solarpanel");
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false));
setHardness(2.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
protected BlockStateContainer createBlockState() {

View file

@ -27,23 +27,26 @@ package techreborn.blocks.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGenerator;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSolidFuelGenerator;
public class BlockGenerator extends BlockMachineBase {
public class BlockSolidFuelGenerator extends BlockMachineBase {
public BlockGenerator() {
public BlockSolidFuelGenerator() {
super();
this.setUnlocalizedName("techreborn.generator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileGenerator();
return new TileSolidFuelGenerator();
}
@Override

View file

@ -27,9 +27,11 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.RebornCore;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileWaterMill;
/**
@ -37,13 +39,11 @@ import techreborn.tiles.generator.TileWaterMill;
*/
public class BlockWaterMill extends BaseTileBlock {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockWaterMill() {
super(Material.IRON);
setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -26,8 +26,11 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileWindMill;
/**
@ -37,9 +40,9 @@ public class BlockWindMill extends BlockMachineBase {
public BlockWindMill() {
super(false);
setUnlocalizedName("techreborn.windmill");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override

View file

@ -24,7 +24,6 @@
package techreborn.blocks.iron_machines;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -32,26 +31,29 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileIronAlloyFurnace;
import java.util.ArrayList;
import java.util.List;
public class BlockAlloyFurnace extends BlockMachineBase {
public class BlockIronAlloyFurnace extends BlockMachineBase {
public BlockAlloyFurnace(final Material material) {
public BlockIronAlloyFurnace() {
super();
this.setUnlocalizedName("techreborn.alloyfurnace");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileAlloyFurnace();
return new TileIronAlloyFurnace();
}
@Override

View file

@ -35,10 +35,13 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileIronFurnace;
import java.util.ArrayList;
@ -49,8 +52,8 @@ public class BlockIronFurnace extends BlockMachineBase {
public BlockIronFurnace() {
super();
this.setUnlocalizedName("techreborn.ironfurnace");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileAssemblingMachine;
public class BlockAssemblingMachine extends BlockMachineBase {
public BlockAssemblingMachine(final Material material) {
public BlockAssemblingMachine() {
super();
this.setUnlocalizedName("techreborn.assemblingmachine");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChemicalReactor;
public class BlockChemicalReactor extends BlockMachineBase {
public BlockChemicalReactor(final Material material) {
public BlockChemicalReactor() {
super();
this.setUnlocalizedName("techreborn.chemicalreactor");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,27 +24,29 @@
package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileScrapboxinator;
import java.util.List;
public class BlockScrapboxinator extends BlockMachineBase {
public BlockScrapboxinator(final Material material) {
public BlockScrapboxinator() {
super();
this.setUnlocalizedName("techreborn.scrapboxinator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,7 +24,6 @@
package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@ -32,18 +31,21 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileVacuumFreezer;
public class BlockVacuumFreezer extends BlockMachineBase {
public BlockVacuumFreezer(final Material material) {
public BlockVacuumFreezer() {
super();
this.setUnlocalizedName("techreborn.vacuumfreezer");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@Override

View file

@ -32,19 +32,19 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
import java.util.ArrayList;
import java.util.List;
public class BlockAESU extends BlockEnergyStorage {
public BlockAESU() {
public class BlockAdjustableSU extends BlockEnergyStorage {
public BlockAdjustableSU() {
super("AESU", EGui.AESU.ordinal());
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileAesu();
return new TileAdjustableSU();
}
@Override

View file

@ -37,9 +37,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import java.util.Iterator;
import java.util.Random;
@ -49,18 +52,17 @@ import java.util.Random;
*/
public abstract class BlockEnergyStorage extends BaseTileBlock {
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
protected final String prefix = "techreborn:blocks/machines/energy/";
public String name;
public int guiID;
public BlockEnergyStorage(String name, int guiID) {
super(Material.ROCK);
super(Material.IRON);
setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
this.name = name;
this.guiID = guiID;
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
}
@Override
@ -147,10 +149,10 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
if (fullName.equalsIgnoreCase("Batbox")) {
return "lv_storage";
}
if (fullName.equalsIgnoreCase("MFE")) {
if (fullName.equalsIgnoreCase("MEDIUM_VOLTAGE_SU")) {
return "mv_storage";
}
if (fullName.equalsIgnoreCase("MFSU")) {
if (fullName.equalsIgnoreCase("HIGH_VOLTAGE_SU")) {
return "hv_storage";
}
if (fullName.equalsIgnoreCase("AESU")) {

View file

@ -32,7 +32,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import java.util.ArrayList;
import java.util.List;
@ -40,15 +40,15 @@ import java.util.List;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockMFSU extends BlockEnergyStorage {
public BlockMFSU() {
super("MFSU", EGui.MFSU.ordinal());
public class BlockHighVoltageSU extends BlockEnergyStorage {
public BlockHighVoltageSU() {
super("high_voltage_su", EGui.HIGH_VOLTAGE_SU.ordinal());
this.setHardness(2f);
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileMFSU();
return new TileHighVoltageSU();
}
@Override

View file

@ -33,27 +33,27 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import java.util.ArrayList;
import java.util.List;
public class BlockIDSU extends BlockEnergyStorage {
public BlockIDSU() {
public class BlockInterdimensionalSU extends BlockEnergyStorage {
public BlockInterdimensionalSU() {
super("IDSU", EGui.IDSU.ordinal());
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileIDSU();
return new TileInterdimensionalSU();
}
@Override
public IBlockState getStateForPlacement(final World world, final BlockPos pos, final EnumFacing facing, final float hitX, final float hitY,
final float hitZ, final int meta, final EntityLivingBase placer) {
final TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileIDSU) {
((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString();
if (tile instanceof TileInterdimensionalSU) {
((TileInterdimensionalSU) tile).ownerUdid = placer.getUniqueID().toString();
}
return this.getDefaultState();
}
@ -69,8 +69,8 @@ public class BlockIDSU extends BlockEnergyStorage {
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, placer, stack);
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileIDSU) {
((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString();
if (tile instanceof TileInterdimensionalSU) {
((TileInterdimensionalSU) tile).ownerUdid = placer.getUniqueID().toString();
}
}
}

View file

@ -33,34 +33,42 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesuStorage;
import techreborn.lib.ModInfo;
import techreborn.tiles.lesu.TileLSUStorage;
import java.util.ArrayList;
import java.util.List;
public class BlockLESUStorage extends BaseTileBlock {
public class BlockLSUStorage extends BaseTileBlock {
;
public BlockLESUStorage(Material material) {
super(material);
setUnlocalizedName("techreborn.lesustorage");
public BlockLSUStorage() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
if (Core.proxy.isCTMAvailable()) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy/ctm"));
} else {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
}
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemstack) {
super.onBlockPlacedBy(world, pos, state, player, itemstack);
if (world.getTileEntity(pos) instanceof TileLesuStorage) {
((TileLesuStorage) world.getTileEntity(pos)).rebuildNetwork();
if (world.getTileEntity(pos) instanceof TileLSUStorage) {
((TileLSUStorage) world.getTileEntity(pos)).rebuildNetwork();
}
}
@Override
public void breakBlock(World world, BlockPos pos, IBlockState state) {
if (world.getTileEntity(pos) instanceof TileLesuStorage) {
((TileLesuStorage) world.getTileEntity(pos)).removeFromNetwork();
if (world.getTileEntity(pos) instanceof TileLSUStorage) {
((TileLSUStorage) world.getTileEntity(pos)).removeFromNetwork();
}
super.breakBlock(world, pos, state);
}
@ -74,7 +82,7 @@ public class BlockLESUStorage extends BaseTileBlock {
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileLesuStorage();
return new TileLSUStorage();
}
public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) {

View file

@ -31,19 +31,19 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLapotronicSU;
import java.util.ArrayList;
import java.util.List;
public class BlockLESU extends BlockEnergyStorage {
public BlockLESU() {
public class BlockLapotronicSU extends BlockEnergyStorage {
public BlockLapotronicSU() {
super("LESU", EGui.LESU.ordinal());
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileLesu();
return new TileLapotronicSU();
}
@Override

View file

@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileLowVoltageSU;
import java.util.ArrayList;
import java.util.List;
@ -39,14 +39,14 @@ import java.util.List;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockBatBox extends BlockEnergyStorage {
public BlockBatBox() {
super("Batbox", EGui.BATBOX.ordinal());
public class BlockLowVoltageSU extends BlockEnergyStorage {
public BlockLowVoltageSU() {
super("low_voltage_su", EGui.LOW_VOLTAGE_SU.ordinal());
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileBatBox();
return new TileLowVoltageSU();
}
@Override

View file

@ -32,7 +32,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMediumVoltageSU;
import java.util.ArrayList;
import java.util.List;
@ -40,14 +40,14 @@ import java.util.List;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockMFE extends BlockEnergyStorage {
public BlockMFE() {
super("MFE", EGui.MFE.ordinal());
public class BlockMediumVoltageSU extends BlockEnergyStorage {
public BlockMediumVoltageSU() {
super("medium_voltage_su", EGui.MEDIUM_VOLTAGE_SU.ordinal());
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileMFE();
return new TileMediumVoltageSU();
}
@Override

View file

@ -24,24 +24,24 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.teir1.TileCompressor;
public class BlockCompressor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockCompressor(final Material material) {
public BlockCompressor() {
super();
this.setUnlocalizedName("techreborn.compressor");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.teir1.TileElectricFurnace;
public class BlockElectricFurnace extends BlockMachineBase {
public BlockElectricFurnace(final Material material) {
public BlockElectricFurnace() {
super();
this.setUnlocalizedName("techreborn.electricfurnace");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.teir1.TileExtractor;
public class BlockExtractor extends BlockMachineBase {
public BlockExtractor(final Material material) {
public BlockExtractor() {
super();
this.setUnlocalizedName("techreborn.extractor");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.teir1.TileGrinder;
public class BlockGrinder extends BlockMachineBase {
public BlockGrinder(final Material material) {
public BlockGrinder() {
super();
this.setUnlocalizedName("techreborn.grinder");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -24,22 +24,24 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.teir1.TileRecycler;
public class BlockRecycler extends BlockMachineBase {
public BlockRecycler(final Material material) {
public BlockRecycler() {
super();
this.setUnlocalizedName("techreborn.recycler");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override

View file

@ -42,7 +42,7 @@ import java.util.List;
public class BlockHVTransformer extends BlockTransformer {
public BlockHVTransformer() {
super("hvtransformer");
super("hv_transformer");
}
@Override

View file

@ -41,7 +41,7 @@ import java.util.List;
public class BlockLVTransformer extends BlockTransformer {
public BlockLVTransformer() {
super("lvtransformer");
super("lv_transformer");
}
@Override

View file

@ -42,7 +42,7 @@ import java.util.List;
public class BlockMVTransformer extends BlockTransformer {
public BlockMVTransformer() {
super("mvtransformer");
super("mv_transformer");
}
@Override

View file

@ -43,8 +43,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidBase;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import java.util.ArrayList;
import java.util.Iterator;
@ -60,12 +63,12 @@ public abstract class BlockTransformer extends BaseTileBlock {
public String name;
public BlockTransformer(String name) {
super(Material.ROCK);
super(Material.IRON);
setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
this.name = name;
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
}
protected BlockStateContainer createBlockState() {

View file

@ -62,9 +62,9 @@ public enum EGui {
IRON_FURNACE(true),
RECYCLER(true),
SCRAPBOXINATOR(true),
BATBOX(true),
MFSU(true),
MFE(true);
LOW_VOLTAGE_SU(true),
HIGH_VOLTAGE_SU(true),
MEDIUM_VOLTAGE_SU(true);
private final boolean containerBuilder;

View file

@ -33,14 +33,14 @@ import techreborn.client.container.*;
import techreborn.client.gui.*;
import techreborn.manual.GuiManual;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.teir1.*;
public class GuiHandler implements IGuiHandler {
@ -57,11 +57,11 @@ public class GuiHandler implements IGuiHandler {
switch (gui) {
case AESU:
return new ContainerAESU((TileAesu) tile, player);
return new ContainerAESU((TileAdjustableSU) tile, player);
case DESTRUCTOPACK:
return new ContainerDestructoPack(player);
case LESU:
return new ContainerLESU((TileLesu) tile, player);
return new ContainerLESU((TileLapotronicSU) tile, player);
default:
break;
}
@ -76,15 +76,15 @@ public class GuiHandler implements IGuiHandler {
switch (gui) {
case AESU:
return new GuiAESU(player, (TileAesu) tile);
return new GuiAESU(player, (TileAdjustableSU) tile);
case ALLOY_FURNACE:
return new GuiAlloyFurnace(player, (TileAlloyFurnace) tile);
return new GuiAlloyFurnace(player, (TileIronAlloyFurnace) tile);
case ALLOY_SMELTER:
return new GuiAlloySmelter(player, (TileAlloySmelter) tile);
case ASSEMBLING_MACHINE:
return new GuiAssemblingMachine(player, (TileAssemblingMachine) tile);
case BATBOX:
return new GuiBatbox(player, (TileBatBox) tile);
case LOW_VOLTAGE_SU:
return new GuiBatbox(player, (TileLowVoltageSU) tile);
case BLAST_FURNACE:
return new GuiBlastFurnace(player, (TileIndustrialBlastFurnace) tile);
case CENTRIFUGE:
@ -108,15 +108,15 @@ public class GuiHandler implements IGuiHandler {
case EXTRACTOR:
return new GuiExtractor(player, (TileExtractor) tile);
case FUSION_CONTROLLER:
return new GuiFusionReactor(player, (TileEntityFusionController) tile);
return new GuiFusionReactor(player, (TileFusionControlComputer) tile);
case GAS_TURBINE:
return new GuiGasTurbine(player, (TileGasTurbine) tile);
case GENERATOR:
return new GuiGenerator(player, (TileGenerator) tile);
return new GuiGenerator(player, (TileSolidFuelGenerator) tile);
case GRINDER:
return new GuiGrinder(player, (TileGrinder) tile);
case IDSU:
return new GuiIDSU(player, (TileIDSU) tile);
return new GuiIDSU(player, (TileInterdimensionalSU) tile);
case IMPLOSION_COMPRESSOR:
return new GuiImplosionCompressor(player, (TileImplosionCompressor) tile);
case INDUSTRIAL_ELECTROLYZER:
@ -126,15 +126,15 @@ public class GuiHandler implements IGuiHandler {
case IRON_FURNACE:
return new GuiIronFurnace(player, (TileIronFurnace) tile);
case LESU:
return new GuiLESU(player, (TileLesu) tile);
return new GuiLESU(player, (TileLapotronicSU) tile);
case MANUAL:
return new GuiManual();
case MATTER_FABRICATOR:
return new GuiMatterFabricator(player, (TileMatterFabricator) tile);
case MFE:
return new GuiMFE(player, (TileMFE) tile);
case MFSU:
return new GuiMFSU(player, (TileMFSU) tile);
case MEDIUM_VOLTAGE_SU:
return new GuiMFE(player, (TileMediumVoltageSU) tile);
case HIGH_VOLTAGE_SU:
return new GuiMFSU(player, (TileHighVoltageSU) tile);
case QUANTUM_CHEST:
return new GuiQuantumChest(player, (TileQuantumChest) tile);
case QUANTUM_TANK:
@ -148,7 +148,7 @@ public class GuiHandler implements IGuiHandler {
case SCRAPBOXINATOR:
return new GuiScrapboxinator(player, (TileScrapboxinator) tile);
case SEMIFLUID_GENERATOR:
return new GuiSemifluidGenerator(player, (TileSemifluidGenerator) tile);
return new GuiSemifluidGenerator(player, (TileSemiFluidGenerator) tile);
case THERMAL_GENERATOR:
return new GuiThermalGenerator(player, (TileThermalGenerator) tile);
case VACUUM_FREEZER:

View file

@ -33,10 +33,6 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.BlockStorage2;
import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.cable.EnumCableType;
import techreborn.config.ConfigTechReborn;
@ -165,26 +161,6 @@ public class RegisterItemJsons {
registerBlockstate(ModItems.UPGRADES, i, name[i], "items/misc/");
}
for (int i = 0; i < BlockOre.ores.length; ++i) {
String[] name = BlockOre.ores.clone();
registerBlockstate(ModBlocks.ORE, i, name[i]);
}
for (int i = 0; i < BlockOre2.ores.length; ++i) {
String[] name = BlockOre2.ores.clone();
registerBlockstate(ModBlocks.ORE2, i, name[i]);
}
for (int i = 0; i < BlockStorage.types.length; ++i) {
String[] name = BlockStorage.types.clone();
registerBlockstate(ModBlocks.STORAGE, i, name[i]);
}
for (int i = 0; i < BlockStorage2.types.length; ++i) {
String[] name = BlockStorage2.types.clone();
registerBlockstate(ModBlocks.STORAGE2, i, name[i]);
}
for (EnumCableType cableType : EnumCableType.values()) {
registerBlockstateMultiItem(Item.getItemFromBlock(ModBlocks.CABLE), cableType.ordinal(), cableType.getName().toLowerCase(), "cable_inv");
}

View file

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
public class ContainerAESU extends RebornContainer {
@ -38,9 +38,9 @@ public class ContainerAESU extends RebornContainer {
public int storedEu;
public int euChange;
EntityPlayer player;
TileAesu tile;
TileAdjustableSU tile;
public ContainerAESU(TileAesu tileaesu, EntityPlayer player) {
public ContainerAESU(TileAdjustableSU tileaesu, EntityPlayer player) {
tile = tileaesu;
this.player = player;

View file

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLapotronicSU;
public class ContainerLESU extends RebornContainer {
@ -40,9 +40,9 @@ public class ContainerLESU extends RebornContainer {
public int connectedBlocks;
public double euStorage;
EntityPlayer player;
TileLesu tile;
TileLapotronicSU tile;
public ContainerLESU(TileLesu tileaesu, EntityPlayer player) {
public ContainerLESU(TileLapotronicSU tileaesu, EntityPlayer player) {
tile = tileaesu;
this.player = player;
@ -111,7 +111,7 @@ public class ContainerLESU extends RebornContainer {
} else if (id == 4) {
this.euStorage = value;
}
this.euStorage = ((connectedBlocks + 1) * TileLesu.storagePerBlock);
this.euStorage = ((connectedBlocks + 1) * TileLapotronicSU.storagePerBlock);
}
}

View file

@ -34,7 +34,7 @@ import reborncore.common.network.NetworkManager;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.container.ContainerAESU;
import techreborn.packets.PacketAesu;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
import java.awt.*;
import java.io.IOException;
@ -43,11 +43,11 @@ public class GuiAESU extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png");
TileAesu aesu;
TileAdjustableSU aesu;
ContainerAESU containerAesu;
public GuiAESU(EntityPlayer player, TileAesu tileaesu) {
public GuiAESU(EntityPlayer player, TileAdjustableSU tileaesu) {
super(new ContainerAESU(tileaesu, player));
this.xSize = 176;
this.ySize = 197;

View file

@ -29,16 +29,16 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileIronAlloyFurnace;
public class GuiAlloyFurnace extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/alloy_furnace.png");
TileAlloyFurnace alloyfurnace;
TileIronAlloyFurnace alloyfurnace;
public GuiAlloyFurnace(final EntityPlayer player, final TileAlloyFurnace alloyFurnace) {
public GuiAlloyFurnace(final EntityPlayer player, final TileIronAlloyFurnace alloyFurnace) {
super(alloyFurnace.createContainer(player));
this.xSize = 176;
this.ySize = 167;

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileLowVoltageSU;
public class GuiBatbox extends GuiBase {
TileBatBox tile;
TileLowVoltageSU tile;
public GuiBatbox(final EntityPlayer player, final TileBatBox tile) {
public GuiBatbox(final EntityPlayer player, final TileLowVoltageSU tile) {
super(player, tile, tile.createContainer(player));
this.tile = tile;
}

View file

@ -38,7 +38,7 @@ import reborncore.common.misc.Location;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.ClientMultiBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import java.io.IOException;
@ -47,9 +47,9 @@ public class GuiFusionReactor extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/fusion_reactor.png");
TileEntityFusionController fusionController;
TileFusionControlComputer fusionController;
public GuiFusionReactor(final EntityPlayer player, final TileEntityFusionController fusion) {
public GuiFusionReactor(final EntityPlayer player, final TileFusionControlComputer fusion) {
super(fusion.createContainer(player));
this.fusionController = fusion;
}

View file

@ -25,13 +25,13 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileGenerator;
import techreborn.tiles.generator.TileSolidFuelGenerator;
public class GuiGenerator extends GuiBase {
TileGenerator tile;
TileSolidFuelGenerator tile;
public GuiGenerator(final EntityPlayer player, final TileGenerator tile) {
public GuiGenerator(final EntityPlayer player, final TileSolidFuelGenerator tile) {
super(player, tile, tile.createContainer(player));
this.tile = tile;
}

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.idsu.TileInterdimensionalSU;
public class GuiIDSU extends GuiBase {
TileIDSU idsu;
TileInterdimensionalSU idsu;
public GuiIDSU(EntityPlayer player, TileIDSU tileIDSU) {
public GuiIDSU(EntityPlayer player, TileInterdimensionalSU tileIDSU) {
super(player, tileIDSU, tileIDSU.createContainer(player));
this.xSize = 176;
this.ySize = 197;

View file

@ -31,7 +31,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.container.ContainerLESU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLapotronicSU;
import java.awt.*;
@ -39,11 +39,11 @@ public class GuiLESU extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png");
TileLesu aesu;
TileLapotronicSU aesu;
ContainerLESU containerLesu;
public GuiLESU(EntityPlayer player, TileLesu tileaesu) {
public GuiLESU(EntityPlayer player, TileLapotronicSU tileaesu) {
super(new ContainerLESU(tileaesu, player));
this.xSize = 176;
this.ySize = 197;

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMediumVoltageSU;
public class GuiMFE extends GuiBase {
TileMFE mfe;
TileMediumVoltageSU mfe;
public GuiMFE(final EntityPlayer player, final TileMFE mfe) {
public GuiMFE(final EntityPlayer player, final TileMediumVoltageSU mfe) {
super(player, mfe, mfe.createContainer(player));
this.mfe = mfe;
}

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileHighVoltageSU;
public class GuiMFSU extends GuiBase {
TileMFSU mfsu;
TileHighVoltageSU mfsu;
public GuiMFSU(final EntityPlayer player, final TileMFSU mfsu) {
public GuiMFSU(final EntityPlayer player, final TileHighVoltageSU mfsu) {
super(player, mfsu, mfsu.createContainer(player));
this.mfsu = mfsu;
}

View file

@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import reborncore.client.RenderUtil;
import techreborn.tiles.generator.TileSemifluidGenerator;
import techreborn.tiles.generator.TileSemiFluidGenerator;
public class GuiSemifluidGenerator extends GuiContainer {
@ -38,9 +38,9 @@ public class GuiSemifluidGenerator extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/semifluid_generator.png");
TileSemifluidGenerator semifluidGenerator;
TileSemiFluidGenerator semifluidGenerator;
public GuiSemifluidGenerator(final EntityPlayer player, final TileSemifluidGenerator semifluidGenerator) {
public GuiSemifluidGenerator(final EntityPlayer player, final TileSemiFluidGenerator semifluidGenerator) {
super(semifluidGenerator.createContainer(player));
this.xSize = 176;
this.ySize = 167;

View file

@ -298,7 +298,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
RecipeCategoryUids.ROLLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR),
EFluidGenerator.SEMIFLUID.getRecipeID());
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GAS_TURBINE),
EFluidGenerator.GAS.getRecipeID());

View file

@ -45,9 +45,9 @@ public enum IC2Duplicates {
SOLAR_PANEL(new ItemStack(ModBlocks.SOLAR_PANEL)),
RECYCLER(new ItemStack(ModBlocks.RECYCLER)),
COMPRESSOR(new ItemStack(ModBlocks.COMPRESSOR)),
BAT_BOX(new ItemStack(ModBlocks.BATTERY_BOX)),
MFE(new ItemStack(ModBlocks.MVSU)),
MFSU(new ItemStack(ModBlocks.HVSU)),
BAT_BOX(new ItemStack(ModBlocks.LOW_VOLTAGE_SU)),
MFE(new ItemStack(ModBlocks.MEDIUM_VOLTAGE_SU)),
MFSU(new ItemStack(ModBlocks.HIGH_VOLTAGE_SU)),
LVT(new ItemStack(ModBlocks.LV_TRANSFORMER)),
MVT(new ItemStack(ModBlocks.MV_TRANSFORMER)),
HVT(new ItemStack(ModBlocks.HV_TRANSFORMER)),

View file

@ -25,7 +25,6 @@
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
@ -38,7 +37,7 @@ import techreborn.blocks.*;
import techreborn.blocks.advanced_machine.*;
import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.generator.*;
import techreborn.blocks.iron_machines.BlockAlloyFurnace;
import techreborn.blocks.iron_machines.BlockIronAlloyFurnace;
import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.machine.*;
import techreborn.blocks.storage.*;
@ -50,15 +49,15 @@ import techreborn.itemblocks.*;
import techreborn.lib.ModInfo;
import techreborn.tiles.*;
import techreborn.tiles.cable.TileCable;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLesuStorage;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLSUStorage;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.teir1.*;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.tiles.transformers.TileLVTransformer;
@ -81,20 +80,20 @@ public class ModBlocks {
public static Block IMPLOSION_COMPRESSOR;
public static Block MATTER_FABRICATOR;
public static Block CHUNK_LOADER;
public static Block DRAGON_EGG_SIPHONER;
public static Block DRAGON_EGG_SYPHON;
public static Block MAGIC_ENERGY_CONVERTER;
public static Block ASSEMBLY_MACHINE;
public static Block DIESEL_GENERATOR;
public static Block INDUSTRIAL_ELECTROLYZER;
public static Block MAGICAL_ABSORBER;
public static Block SEMIFLUID_GENERATOR;
public static Block SEMI_FLUID_GENERATOR;
public static Block GAS_TURBINE;
public static Block IRON_ALLOY_FURNACE;
public static Block CHEMICAL_REACTOR;
public static Block INTERDIMENSIONAL_SU;
public static Block ADJUSTABLE_SU;
public static Block LAPOTRONIC_SU;
public static Block LSU_STORAGE_BLOCK;
public static Block LSU_STORAGE;
public static Block DISTILLATION_TOWER;
public static Block VACUUM_FREEZER;
public static Block FUSION_CONTROL_COMPUTER;
@ -110,13 +109,13 @@ public class ModBlocks {
public static Block EXTRACTOR;
public static Block ELECTRIC_FURNACE;
public static Block SOLAR_PANEL;
public static Block CREATIVE_PANEL;
public static Block CREATIVE_SOLAR_PANEL;
public static Block WATER_MILL;
public static Block WIND_MILL;
public static Block RECYCLER;
public static Block BATTERY_BOX;
public static Block MVSU;
public static Block HVSU;
public static Block LOW_VOLTAGE_SU;
public static Block MEDIUM_VOLTAGE_SU;
public static Block HIGH_VOLTAGE_SU;
public static Block SCRAPBOXINATOR;
public static Block LV_TRANSFORMER;
public static Block MV_TRANSFORMER;
@ -217,218 +216,183 @@ public class ModBlocks {
STORAGE2 = new BlockStorage2();
registerBlock(STORAGE2, ItemBlockStorage2.class, "storage2");
DRAGON_EGG_SIPHONER = new BlockDragonEggSiphoner(Material.ROCK);
registerBlock(DRAGON_EGG_SIPHONER, "dragoneggenergsiphon");
GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR");
Core.proxy.registerCustomBlockStateLocation(DRAGON_EGG_SIPHONER, "machines/generators/dragon_egg_syphon");
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
GameRegistry.registerTileEntity(TileDragonEggSyphon.class, "TileDragonEggSyphonTR");
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(Material.ROCK);
registerBlock(MAGIC_ENERGY_CONVERTER, "magicenergyconverter");
Core.proxy.registerCustomBlockStateLocation(MAGIC_ENERGY_CONVERTER, "machines/generators/magic_energy_converter");
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter();
registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter");
ASSEMBLY_MACHINE = new BlockAssemblingMachine(Material.ROCK);
registerBlock(ASSEMBLY_MACHINE, "assemblymachine");
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
registerBlock(ASSEMBLY_MACHINE, "assembly_machine");
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
Core.proxy.registerCustomBlockStateLocation(ASSEMBLY_MACHINE, "machines/tier1_machines/assembly_machine");
DIESEL_GENERATOR = new BlockDieselGenerator(Material.ROCK);
registerBlock(DIESEL_GENERATOR, "dieselgenerator");
DIESEL_GENERATOR = new BlockDieselGenerator();
registerBlock(DIESEL_GENERATOR, "diesel_generator");
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(DIESEL_GENERATOR, "machines/generators/diesel_generator");
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(Material.ROCK);
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrialelectrolyzer");
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer();
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer");
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_ELECTROLYZER, "machines/tier1_machines/industrial_electrolyzer");
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(Material.ROCK);
registerBlock(MAGICAL_ABSORBER, "magicrnergyabsorber");
Core.proxy.registerCustomBlockStateLocation(MAGICAL_ABSORBER, "machines/generators/magic_energy_absorber");
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber");
SEMIFLUID_GENERATOR = new BlockSemiFluidGenerator(Material.ROCK);
registerBlock(SEMIFLUID_GENERATOR, "semifluidgenerator");
GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(SEMIFLUID_GENERATOR, "machines/generators/semi_fluid_generator");
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
GameRegistry.registerTileEntity(TileSemiFluidGenerator.class, "TileSemiFluidGeneratorTR");
GAS_TURBINE = new BlockGasTurbine(Material.ROCK);
registerBlock(GAS_TURBINE, "gasturbine");
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR");
Core.proxy.registerCustomBlockStateLocation(GAS_TURBINE, "machines/generators/gas_turbine");
GAS_TURBINE = new BlockGasTurbine();
registerBlock(GAS_TURBINE, "gas_turbine");
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGasTurbineTR");
IRON_ALLOY_FURNACE = new BlockAlloyFurnace(Material.ROCK);
registerBlock(IRON_ALLOY_FURNACE, "alloyfurnace");
GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(IRON_ALLOY_FURNACE, "machines/tier0_machines/alloy_furnace");
IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace();
registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace");
GameRegistry.registerTileEntity(TileIronAlloyFurnace.class, "TileIronAlloyFurnaceTR");
CHEMICAL_REACTOR = new BlockChemicalReactor(Material.ROCK);
registerBlock(CHEMICAL_REACTOR, "chemicalreactor");
CHEMICAL_REACTOR = new BlockChemicalReactor();
registerBlock(CHEMICAL_REACTOR, "chemical_reactor");
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
Core.proxy.registerCustomBlockStateLocation(CHEMICAL_REACTOR, "machines/tier1_machines/chemical_reactor");
INTERDIMENSIONAL_SU = new BlockIDSU();
registerBlock(INTERDIMENSIONAL_SU, "idsu");
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
registerBlock(INTERDIMENSIONAL_SU, "inderdimensional_su");
GameRegistry.registerTileEntity(TileInterdimensionalSU.class, "TileInterdimensionalSUTR");
ADJUSTABLE_SU = new BlockAESU();
registerBlock(ADJUSTABLE_SU, ItemBlockAesu.class, "aesu");
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
ADJUSTABLE_SU = new BlockAdjustableSU();
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
GameRegistry.registerTileEntity(TileAdjustableSU.class, "TileAdjustableSUTR");
LAPOTRONIC_SU = new BlockLESU();
registerBlock(LAPOTRONIC_SU, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
LAPOTRONIC_SU = new BlockLapotronicSU();
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
GameRegistry.registerTileEntity(TileLapotronicSU.class, "TileLapotronicSUTR");
LSU_STORAGE_BLOCK = new BlockLESUStorage(Material.ROCK);
registerBlock(LSU_STORAGE_BLOCK, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
if (Core.proxy.isCTMAvailable()) {
Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage_ctm");
} else {
Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage");
}
LSU_STORAGE = new BlockLSUStorage();
registerBlock(LSU_STORAGE, "lsu_storage");
GameRegistry.registerTileEntity(TileLSUStorage.class, "TileLSUStorageTR");
DISTILLATION_TOWER = new BlockDistillationTower(Material.ROCK);
registerBlock(DISTILLATION_TOWER, "distillationtower");
Core.proxy.registerCustomBlockStateLocation(DISTILLATION_TOWER, "machines/tier2_machines/distillation_tower");
DISTILLATION_TOWER = new BlockDistillationTower();
registerBlock(DISTILLATION_TOWER, "distillation_tower");
VACUUM_FREEZER = new BlockVacuumFreezer(Material.ROCK);
registerBlock(VACUUM_FREEZER, "vacuumfreezer");
VACUUM_FREEZER = new BlockVacuumFreezer();
registerBlock(VACUUM_FREEZER, "vacuum_freezer");
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
Core.proxy.registerCustomBlockStateLocation(VACUUM_FREEZER, "machines/tier2_machines/vacuum_freezer");
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(Material.ROCK);
registerBlock(FUSION_CONTROL_COMPUTER, "fusioncontrolcomputer");
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
Core.proxy.registerCustomBlockStateLocation(FUSION_CONTROL_COMPUTER, "machines/generators/fusion_reactor");
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
GameRegistry.registerTileEntity(TileFusionControlComputer.class, "TileFusionControlComputerTR");
FUSION_COIL = new BlockFusionCoil(Material.ROCK);
registerBlock(FUSION_COIL, "fusioncoil");
Core.proxy.registerCustomBlockStateLocation(FUSION_COIL, "machines/generators/fusion_coil");
FUSION_COIL = new BlockFusionCoil();
registerBlock(FUSION_COIL, "fusion_coil");
LIGHTNING_ROD = new BlockLightningRod(Material.ROCK);
registerBlock(LIGHTNING_ROD, "lightningrod");
LIGHTNING_ROD = new BlockLightningRod();
registerBlock(LIGHTNING_ROD, "lightning_rod");
GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR");
Core.proxy.registerCustomBlockStateLocation(LIGHTNING_ROD, "machines/generators/lightning_rod");
HEAT_GENERATOR = new BlockHeatGenerator(Material.ROCK);
registerBlock(HEAT_GENERATOR, "heatgenerator");
HEAT_GENERATOR = new BlockHeatGenerator();
registerBlock(HEAT_GENERATOR, "heat_generator");
GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR");
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(Material.ROCK);
registerBlock(INDUSTRIAL_SAWMILL, "industrialSawmill");
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill();
registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill");
GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR");
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_SAWMILL, "machines/tier2_machines/industrial_saw_mill");
MACHINE_FRAMES = new BlockMachineFrame(Material.IRON);
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrame.class, "techreborn.machineFrame");
Core.proxy.registerCustomBlockStateLocation(MACHINE_FRAMES, "machines/storage/machine_blocks");
MACHINE_FRAMES = new BlockMachineFrames();
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame");
GRINDER = new BlockGrinder(Material.IRON);
registerBlock(GRINDER, "techreborn.grinder");
GRINDER = new BlockGrinder();
registerBlock(GRINDER, "grinder");
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
Core.proxy.registerCustomBlockStateLocation(GRINDER, "machines/tier1_machines/grinder");
SOLID_FUEL_GENEREATOR = new BlockGenerator();
registerBlock(SOLID_FUEL_GENEREATOR, "techreborn.generator");
GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(SOLID_FUEL_GENEREATOR, "machines/generators/generator");
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
GameRegistry.registerTileEntity(TileSolidFuelGenerator.class, "TileSolidFuelGeneratorTR");
EXTRACTOR = new BlockExtractor(Material.IRON);
registerBlock(EXTRACTOR, "techreborn.extractor");
EXTRACTOR = new BlockExtractor();
registerBlock(EXTRACTOR, "extractor");
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
Core.proxy.registerCustomBlockStateLocation(EXTRACTOR, "machines/tier1_machines/extractor");
COMPRESSOR = new BlockCompressor(Material.IRON);
registerBlock(COMPRESSOR, "techreborn.compressor");
COMPRESSOR = new BlockCompressor();
registerBlock(COMPRESSOR, "compressor");
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
Core.proxy.registerCustomBlockStateLocation(COMPRESSOR, "machines/tier1_machines/compressor");
ELECTRIC_FURNACE = new BlockElectricFurnace(Material.IRON);
registerBlock(ELECTRIC_FURNACE, "techreborn.electricfurnace");
ELECTRIC_FURNACE = new BlockElectricFurnace();
registerBlock(ELECTRIC_FURNACE, "electric_furnace");
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(ELECTRIC_FURNACE, "machines/tier1_machines/electric_furnace");
SOLAR_PANEL = new BlockSolarPanel();
registerBlock(SOLAR_PANEL, "techreborn.solarpanel");
GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanel");
Core.proxy.registerCustomBlockStateLocation(SOLAR_PANEL, "machines/generators/solar_panel");
registerBlock(SOLAR_PANEL, "solar_panel");
GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanelTR");
CREATIVE_PANEL = new BlockCreativePanel();
registerBlock(CREATIVE_PANEL, "techreborn.creativepanel");
GameRegistry.registerTileEntity(TileCreativePanel.class, "TileCreativePanel");
Core.proxy.registerCustomBlockStateLocation(CREATIVE_PANEL, "machines/generators/creative_panel");
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
GameRegistry.registerTileEntity(TileCreativeSolarPanel.class, "TileCreativeSolarPanelTR");
WATER_MILL = new BlockWaterMill();
registerBlock(WATER_MILL, "techreborn.watermill");
GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMill");
Core.proxy.registerCustomBlockStateLocation(WATER_MILL, "machines/generators/water_mill");
registerBlock(WATER_MILL, "water_mill");
GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMillTR");
WIND_MILL = new BlockWindMill();
registerBlock(WIND_MILL, "techreborn.windmill");
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMill");
Core.proxy.registerCustomBlockStateLocation(WIND_MILL, "machines/generators/wind_mill");
registerBlock(WIND_MILL, "wind_mill");
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMillTR");
GameRegistry.registerTileEntity(TileMachineBase.class, "TileMachineBaseTR");
RUBBER_LOG = new BlockRubberLog();
registerBlock(RUBBER_LOG, "rubberLog");
registerBlock(RUBBER_LOG, "rubber_log");
RUBBER_PLANKS = new BlockRubberPlank();
registerBlock(RUBBER_PLANKS, "rubberPlanks");
registerBlock(RUBBER_PLANKS, "rubber_planks");
RUBBER_LEAVES = new BlockRubberLeaves();
registerBlock(RUBBER_LEAVES, "rubberLeaves");
registerBlock(RUBBER_LEAVES, "rubber_leaves");
RUBBER_SAPLING = new BlockRubberSapling();
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubberSapling");
Core.proxy.registerCustomBlockStateLocation(RUBBER_SAPLING, "rubbersapling");
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
REFINED_IRON_FENCE = new BlockIronFence();
registerBlock(REFINED_IRON_FENCE, "ironFence");
REFINED_IRON_FENCE = new BlockRefinedIronFence();
registerBlock(REFINED_IRON_FENCE, "refined_iron_fence");
REINFORCED_GLASS = new BlockReinforcedGlass(Material.GLASS);
registerBlock(REINFORCED_GLASS, "reinforcedglass");
REINFORCED_GLASS = new BlockReinforcedGlass();
registerBlock(REINFORCED_GLASS, "reinforced_glass");
RECYCLER = new BlockRecycler(Material.IRON);
RECYCLER = new BlockRecycler();
registerBlock(RECYCLER, "recycler");
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
Core.proxy.registerCustomBlockStateLocation(RECYCLER, "machines/tier1_machines/recycler");
BATTERY_BOX = new BlockBatBox();
registerBlock(BATTERY_BOX, "batBox");
GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox");
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
GameRegistry.registerTileEntity(TileLowVoltageSU.class, "TileLowVoltageSUTR");
MVSU = new BlockMFE();
registerBlock(MVSU, "MFE");
GameRegistry.registerTileEntity(TileMFE.class, "TileMFE");
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
GameRegistry.registerTileEntity(TileMediumVoltageSU.class, "TileMediumVoltageSUTR");
HVSU = new BlockMFSU();
registerBlock(HVSU, "MFSU");
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
GameRegistry.registerTileEntity(TileHighVoltageSU.class, "TileHighVoltageSUTR");
LV_TRANSFORMER = new BlockLVTransformer();
registerBlock(LV_TRANSFORMER, "LVT");
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer");
registerBlock(LV_TRANSFORMER, "lv_transformer");
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformerTR");
MV_TRANSFORMER = new BlockMVTransformer();
registerBlock(MV_TRANSFORMER, "MVT");
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer");
registerBlock(MV_TRANSFORMER, "mv_transformer");
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformerTR");
HV_TRANSFORMER = new BlockHVTransformer();
registerBlock(HV_TRANSFORMER, "HVT");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
registerBlock(HV_TRANSFORMER, "hv_transformer");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformerTR");
IRON_FURNACE = new BlockIronFurnace();
registerBlock(IRON_FURNACE, "ironfurnace");
registerBlock(IRON_FURNACE, "iron_furnace");
GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(IRON_FURNACE, "machines/tier0_machines/furnace");
NUKE = new BlockNuke();
registerBlock(NUKE, "nuke");
SCRAPBOXINATOR = new BlockScrapboxinator(Material.IRON);
SCRAPBOXINATOR = new BlockScrapboxinator();
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
Core.proxy.registerCustomBlockStateLocation(SCRAPBOXINATOR, "machines/tier1_machines/scrapboxinator");
//TODO enable when done
// flare = new BlockFlare();
@ -516,9 +480,9 @@ public class ModBlocks {
OreDictionary.registerOre("fenceIron", REFINED_IRON_FENCE);
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("basic", 1));
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advanced", 1));
OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrames.getFrameByName("highly_advanced", 1));
}

View file

@ -35,7 +35,7 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.BucketHandler;
import techreborn.Core;
import techreborn.api.Reference;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.config.ConfigTechReborn;
import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack;
@ -341,8 +341,8 @@ public class ModItems {
Core.logHelper.info("TechReborns Items Loaded");
BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1);
BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1);
BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1);
BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1);
OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
}

View file

@ -44,7 +44,7 @@ import techreborn.Core;
import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.machines.*;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.BlockOre;
import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn;
@ -411,10 +411,10 @@ public class ModRecipes {
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ALLOY_SMELTER), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), 'M',
BlockMachineFrame.getFrameByName("machine", 1));
BlockMachineFrames.getFrameByName("machine", 1));
RebornCraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.LSU_STORAGE_BLOCK), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
.addShapedOreRecipe(new ItemStack(ModBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
"circuitBasic");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hot_tungstensteel"),
@ -746,7 +746,7 @@ public class ModRecipes {
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E',
"circuitMaster", 'T', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.LAPOTRONIC_ORB);
BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.LAPOTRONIC_ORB);
RebornCraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.HEAT_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H',
@ -765,11 +765,11 @@ public class ModRecipes {
getOre("glassReinforced"));
RebornCraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron",
.addShapedOreRecipe(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron",
'H', ModBlocks.REINFORCED_GLASS, 'C', "circuitBasic", 'G',
IC2Duplicates.GENERATOR.getStackBasedOnConfig());
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR), "AAA", "AHA", "CGC", 'A',
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), "AAA", "AHA", "CGC", 'A',
"plateAluminum", 'H', ModBlocks.REINFORCED_GLASS, 'C', "circuitBasic", 'G',
IC2Duplicates.GENERATOR.getStackBasedOnConfig());
@ -805,7 +805,7 @@ public class ModRecipes {
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig());
BlockMachineFrames.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig());
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E',
ModBlocks.INDUSTRIAL_ELECTROLYZER, 'H', "craftingGrinder", 'C',
@ -814,7 +814,7 @@ public class ModRecipes {
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
BlockMachineFrames.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
RebornCraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C',
@ -865,10 +865,10 @@ public class ModRecipes {
// 'M', new ItemStack(ModItems.parts, 1, 39));
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', IC2Duplicates.LVT.getStackBasedOnConfig(), 'C',
"circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LSU_STORAGE_BLOCK);
"circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LSU_STORAGE);
RebornCraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC",
.addShapedOreRecipe(BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC",
'C', "ingotChrome", 'T', "ingotTitanium", 'B',
"machineBlockAdvanced");
@ -880,12 +880,12 @@ public class ModRecipes {
"plateSteel", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced");
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MACHINE_CASINGS, 4, 2), "HHH", "CBC", "HHH", 'H',
"ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
"ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1));
if (!CompatManager.isQuantumStorageLoaded) {
RebornCraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.DIGITAL_CHEST, 'T',
BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.DIGITAL_CHEST, 'T',
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
}

View file

@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.cable.BlockCable;
import techreborn.items.*;
@ -59,9 +59,9 @@ public class OreDict {
OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
OreDictionary.registerOre("machineBlockElite", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("machine", 1));
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advancedMachine", 1));
OreDictionary.registerOre("machineBlockElite", BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1));
OreDictionary.registerOre("lapotronCrystal", ModItems.LAPOTRONIC_CRYSTAL);
OreDictionary.registerOre("energyCrystal", ModItems.ENERGY_CRYSTAL);

View file

@ -31,7 +31,7 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.cable.BlockCable;
import techreborn.init.IC2Duplicates;
import techreborn.items.*;
@ -60,7 +60,7 @@ public abstract class RecipeMethods {
} else if (type == Type.CABLE) {
return BlockCable.getCableByName(name, count);
} else if (type == Type.MACHINE_FRAME) {
return BlockMachineFrame.getFrameByName(name, count);
return BlockMachineFrames.getFrameByName(name, count);
} else if (type == Type.MACHINE_CASING) {
return BlockMachineCasing.getStackByName(name, count);
} else if (type == Type.UPGRADE) {

View file

@ -40,13 +40,13 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.init.ModBlocks;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
import java.util.List;
public class ItemBlockAesu extends ItemBlock {
public class ItemBlockAdjustableSU extends ItemBlock {
public ItemBlockAesu(Block p_i45328_1_) {
public ItemBlockAdjustableSU(Block p_i45328_1_) {
super(p_i45328_1_);
}
@ -73,7 +73,7 @@ public class ItemBlockAesu extends ItemBlock {
// y, z, metadata);
}
if (stack != ItemStack.EMPTY && stack.hasTagCompound()) {
((TileAesu) world.getTileEntity(pos))
((TileAdjustableSU) world.getTileEntity(pos))
.readFromNBTWithoutCoords(stack.getTagCompound().getCompoundTag("tileEntity"));
}
return true;

View file

@ -26,13 +26,13 @@ package techreborn.itemblocks;
import net.minecraft.block.Block;
import reborncore.common.itemblock.ItemBlockBase;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.init.ModBlocks;
public class ItemBlockMachineFrame extends ItemBlockBase {
public class ItemBlockMachineFrames extends ItemBlockBase {
public ItemBlockMachineFrame(Block block) {
super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrame.types);
public ItemBlockMachineFrames(Block block) {
super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrames.types);
}
}

View file

@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.INetworkPacket;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
import java.io.IOException;
@ -40,7 +40,7 @@ public class PacketAesu implements INetworkPacket<PacketAesu> {
public PacketAesu() {
}
public PacketAesu(int buttonID, TileAesu tile) {
public PacketAesu(int buttonID, TileAdjustableSU tile) {
this.pos = tile.getPos();
this.buttonID = buttonID;
}

View file

@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.INetworkPacket;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import java.io.IOException;
@ -40,7 +40,7 @@ public class PacketIdsu implements INetworkPacket<PacketIdsu> {
public PacketIdsu() {
}
public PacketIdsu(int buttonID, TileIDSU tile) {
public PacketIdsu(int buttonID, TileInterdimensionalSU tile) {
this.pos = tile.getPos();
this.buttonID = buttonID;
}

View file

@ -51,7 +51,7 @@ import reborncore.client.hud.StackInfoHUD;
import reborncore.client.multiblock.MultiblockRenderEvent;
import techreborn.Core;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.BlockRubberLeaves;
import techreborn.client.ClientMultiBlocks;
import techreborn.client.IconSupplier;
@ -100,31 +100,6 @@ public class ClientProxy extends CommonProxy {
StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter());
RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke());
ManualLoader loader = new ManualLoader(new File(event.getModConfigurationDirectory(), "techreborn"));
// new Thread(() ->`
// {
// try {
// loader.load();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }).start();
// for (Object object : RebornCore.jsonDestroyer.objectsToDestroy) {
// if (object instanceof BlockMachineBase) {
// BlockMachineBase base = (BlockMachineBase) object;
// registerItemModel(Item.getItemFromBlock(base));
// }
// }
for (int i = 0; i < BlockMachineCasing.types.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_CASINGS, i, "techreborn:machines/structure/machine_casing", "type=" + i);
}
for (int i = 0; i < BlockMachineFrame.types.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_FRAMES, i, "techreborn:machines/storage/machine_blocks", "type=" + i);
}
ModelDynamicCell.init();
RegisterItemJsons.registerModels();
}

View file

@ -37,7 +37,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileAesu extends TilePowerAcceptor implements IWrenchable {
public class TileAdjustableSU extends TilePowerAcceptor implements IWrenchable {
@ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxInput", comment = "AESU Max Input (Value in EU)")
public static int maxInput = 8192;
@ -46,13 +46,13 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
@ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxEnergy", comment = "AESU Max Energy (Value in EU)")
public static int maxEnergy = 100000000;
public Inventory inventory = new Inventory(4, "TileAesu", 64, this);
public Inventory inventory = new Inventory(4, "TileAdjustableSU", 64, this);
private int OUTPUT = 64; // The current output
private double euLastTick = 0;
private double euChange;
private int ticks;
public TileAesu() {
public TileAdjustableSU() {
super();
}

View file

@ -50,14 +50,14 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileAlloyFurnace extends TileLegacyMachineBase
public class TileIronAlloyFurnace extends TileLegacyMachineBase
implements IWrenchable, IInventoryProvider, IContainerProvider {
// @ConfigRegistry(config = "machines", category = "alloy_furnace", key = "AlloyFurnaceWrenchDropRate", comment = "Alloy Furnace Wrench Drop Rate")
public static float wrenchDropRate = 1.0F;
public int tickTime;
public Inventory inventory = new Inventory(4, "TileAlloyFurnace", 64, this);
public Inventory inventory = new Inventory(4, "TileIronAlloyFurnace", 64, this);
public int burnTime;
public int currentItemBurnTime;
public int cookTime;
@ -66,7 +66,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase
int output = 2;
int fuel = 3;
public TileAlloyFurnace() {
public TileIronAlloyFurnace() {
}
@ -127,7 +127,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase
if (!this.world.isRemote) {
if (this.burnTime != 0 || this.getStackInSlot(this.input1) != ItemStack.EMPTY && this.getStackInSlot(this.fuel) != ItemStack.EMPTY) {
if (this.burnTime == 0 && this.canSmelt()) {
this.currentItemBurnTime = this.burnTime = TileAlloyFurnace.getItemBurnTime(this.getStackInSlot(this.fuel));
this.currentItemBurnTime = this.burnTime = TileIronAlloyFurnace.getItemBurnTime(this.getStackInSlot(this.fuel));
if (this.burnTime > 0) {
flag1 = true;
if (this.getStackInSlot(this.fuel) != ItemStack.EMPTY) {

View file

@ -45,7 +45,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileEntityFusionController extends TilePowerAcceptor implements IInventoryProvider, IContainerProvider {
public class TileFusionControlComputer extends TilePowerAcceptor implements IInventoryProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorMaxInput", comment = "Fusion Reactor Max Input (Value in EU)")
public static int maxInput = 8192;
@ -56,7 +56,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
// @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorWrenchDropRate", comment = "Fusion Reactor Wrench Drop Rate")
public static float wrenchDropRate = 1.0F;
public Inventory inventory = new Inventory(3, "TileEntityFusionController", 64, this);
public Inventory inventory = new Inventory(3, "TileFusionControlComputer", 64, this);
// 0= no coils, 1 = coils
public int coilStatus = 0;
@ -69,7 +69,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
FusionReactorRecipe currentRecipe = null;
boolean hasStartedCrafting = false;
public TileEntityFusionController() {
public TileFusionControlComputer() {
super();
}

View file

@ -38,7 +38,7 @@ import java.util.List;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable {
public class TileCreativeSolarPanel extends TilePowerAcceptor implements IWrenchable {
boolean shouldMakePower = false;
boolean lastTickSate = false;

View file

@ -40,7 +40,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventoryProvider {
public class TileDragonEggSyphon extends TilePowerAcceptor implements IWrenchable, IInventoryProvider {
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerMaxOutput", comment = "Dragon Egg Siphoner Max Output (Value in EU)")
public static int maxOutput = 128;
@ -49,10 +49,10 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerEnergyPerTick", comment = "Dragon Egg Siphoner Energy Per Tick (Value in EU)")
public static int energyPerTick = 4;
public Inventory inventory = new Inventory(3, "TileDragonEggSiphoner", 64, this);
public Inventory inventory = new Inventory(3, "TileDragonEggSyphon", 64, this);
private long lastOutput = 0;
public TileDragonEggSiphoner() {
public TileDragonEggSyphon() {
super();
}
@ -109,7 +109,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.DRAGON_EGG_SIPHONER, 1);
return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1);
}
public boolean isComplete() {

View file

@ -36,7 +36,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IContainerProvider {
public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IContainerProvider {
@ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorMaxOutput", comment = "Semifluid Generator Max Output (Value in EU)")
public static int maxOutput = 128;
@ -47,13 +47,13 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC
@ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorEnergyPerTick", comment = "Semifluid Generator Energy Per Tick (Value in EU)")
public static int energyPerTick = 8;
public TileSemifluidGenerator() {
super(EFluidGenerator.SEMIFLUID, "TileSemifluidGenerator", tankCapacity, energyPerTick);
public TileSemiFluidGenerator() {
super(EFluidGenerator.SEMIFLUID, "TileSemiFluidGenerator", tankCapacity, energyPerTick);
}
@Override
public ItemStack getWrenchDrop(final EntityPlayer arg0) {
return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1);
return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1);
}
@Override

View file

@ -45,7 +45,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider {
public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "generator", key = "GeneratorMaxOutput", comment = "Solid Fuel Generator Max Output (Value in EU)")
public static int maxOutput = 32;
@ -54,7 +54,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@ConfigRegistry(config = "machines", category = "generator", key = "GeneratorEnergyOutput", comment = "Solid Fuel Generator Energy Output Amount (Value in EU)")
public static int outputAmount = 10;
public Inventory inventory = new Inventory(2, "TileGenerator", 64, this);
public Inventory inventory = new Inventory(2, "TileSolidFuelGenerator", 64, this);
public int fuelSlot = 0;
public int burnTime;
public int totalBurnTime = 0;
@ -64,7 +64,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
public boolean lastTickBurning;
ItemStack burnItem;
public TileGenerator() {
public TileSolidFuelGenerator() {
super();
}
@ -81,7 +81,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
if (this.getEnergy() < this.getMaxPower()) {
if (this.burnTime > 0) {
this.burnTime--;
this.addEnergy(TileGenerator.outputAmount);
this.addEnergy(TileSolidFuelGenerator.outputAmount);
this.isBurning = true;
}
} else {
@ -90,7 +90,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
if (this.burnTime == 0) {
this.updateState();
this.burnTime = this.totalBurnTime = TileGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot));
this.burnTime = this.totalBurnTime = TileSolidFuelGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot));
if (this.burnTime > 0) {
this.updateState();
this.burnItem = this.getStackInSlot(this.fuelSlot);
@ -204,7 +204,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return TileGenerator.getItemBurnTime(itemStackIn) != 0;
return TileSolidFuelGenerator.getItemBurnTime(itemStackIn) != 0;
}
@Override

View file

@ -38,7 +38,7 @@ import techreborn.lib.ModInfo;
import techreborn.tiles.storage.TileEnergyStorage;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileIDSU extends TileEnergyStorage implements IContainerProvider {
public class TileInterdimensionalSU extends TileEnergyStorage implements IContainerProvider {
@ConfigRegistry(config = "machines", category = "idsu", key = "IdsuMaxInput", comment = "IDSU Max Input (Value in EU)")
public static int maxInput = 8192;
@ -49,7 +49,7 @@ public class TileIDSU extends TileEnergyStorage implements IContainerProvider {
public String ownerUdid;
public TileIDSU() {
public TileInterdimensionalSU() {
super("IDSU", 2, ModBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
}

View file

@ -28,24 +28,24 @@ import java.util.ArrayList;
public class LesuNetwork {
public ArrayList<TileLesuStorage> storages = new ArrayList<>();
public ArrayList<TileLSUStorage> storages = new ArrayList<>();
public TileLesu master;
public TileLapotronicSU master;
public void addElement(TileLesuStorage lesuStorage) {
public void addElement(TileLSUStorage lesuStorage) {
if (!storages.contains(lesuStorage) && storages.size() < 5000) {
storages.add(lesuStorage);
}
}
public void removeElement(TileLesuStorage lesuStorage) {
public void removeElement(TileLSUStorage lesuStorage) {
storages.remove(lesuStorage);
rebuild();
}
private void rebuild() {
master = null;
for (TileLesuStorage lesuStorage : storages) {
for (TileLSUStorage lesuStorage : storages) {
lesuStorage.findAndJoinNetwork(lesuStorage.getWorld(), lesuStorage.getPos().getX(),
lesuStorage.getPos().getY(), lesuStorage.getPos().getZ());
}
@ -53,10 +53,10 @@ public class LesuNetwork {
public void merge(LesuNetwork network) {
if (network != this) {
ArrayList<TileLesuStorage> tileLesuStorages = new ArrayList<>();
ArrayList<TileLSUStorage> tileLesuStorages = new ArrayList<>();
tileLesuStorages.addAll(network.storages);
network.clear(false);
for (TileLesuStorage lesuStorage : tileLesuStorages) {
for (TileLSUStorage lesuStorage : tileLesuStorages) {
lesuStorage.setNetwork(this);
}
if (network.master != null && this.master == null) {
@ -67,7 +67,7 @@ public class LesuNetwork {
private void clear(boolean clearTiles) {
if (clearTiles) {
for (TileLesuStorage tileLesuStorage : storages) {
for (TileLSUStorage tileLesuStorage : storages) {
tileLesuStorage.resetNetwork();
}
}

View file

@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.tile.TileLegacyMachineBase;
public class TileLesuStorage extends TileLegacyMachineBase {
public class TileLSUStorage extends TileLegacyMachineBase {
public LesuNetwork network;
@ -52,8 +52,8 @@ public class TileLesuStorage extends TileLegacyMachineBase {
network.addElement(this);
for (EnumFacing direction : EnumFacing.values()) {
if (world.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(),
z + direction.getFrontOffsetZ())) instanceof TileLesuStorage) {
TileLesuStorage lesu = (TileLesuStorage) world
z + direction.getFrontOffsetZ())) instanceof TileLSUStorage) {
TileLSUStorage lesu = (TileLSUStorage) world
.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(),
z + direction.getFrontOffsetZ()));
if (lesu.network != null) {

View file

@ -31,13 +31,13 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.Inventory;
import techreborn.blocks.storage.BlockLESU;
import techreborn.blocks.storage.BlockLapotronicSU;
import techreborn.lib.ModInfo;
import java.util.ArrayList;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileLesu extends TilePowerAcceptor {// TODO wrench
public class TileLapotronicSU extends TilePowerAcceptor {// TODO wrench
@ConfigRegistry(config = "machines", category = "lesu", key = "LesuMaxInput", comment = "LESU Max Input (Value in EU)")
public static int maxInput = 8192;
@ -49,7 +49,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench
public static int extraIOPerBlock = 8;
public int connectedBlocks = 0;
public Inventory inventory = new Inventory(2, "TileAesu", 64, this);
public Inventory inventory = new Inventory(2, "TileAdjustableSU", 64, this);
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>();
private double euLastTick = 0;
private double euChange;
@ -57,7 +57,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench
private int output;
private int maxStorage;
public TileLesu() {
public TileLapotronicSU() {
super();
}
@ -72,11 +72,11 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench
for (EnumFacing dir : EnumFacing.values()) {
if (world.getTileEntity(
new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLesuStorage) {
if (((TileLesuStorage) world.getTileEntity(
getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLSUStorage) {
if (((TileLSUStorage) world.getTileEntity(
new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ()))).network != null) {
LesuNetwork network = ((TileLesuStorage) world.getTileEntity(new BlockPos(
LesuNetwork network = ((TileLSUStorage) world.getTileEntity(new BlockPos(
getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ()))).network;
if (!countedNetworks.contains(network)) {
@ -145,8 +145,8 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench
@Override
public EnumFacing getFacingEnum() {
Block block = world.getBlockState(pos).getBlock();
if (block instanceof BlockLESU) {
return ((BlockLESU) block).getFacing(world.getBlockState(pos));
if (block instanceof BlockLapotronicSU) {
return ((BlockLapotronicSU) block).getFacing(world.getBlockState(pos));
}
return null;
}

View file

@ -34,9 +34,9 @@ public class MultiblockChecker {
public static final BlockPos ZERO_OFFSET = BlockPos.ORIGIN;
public static final int CASING_NORMAL = 0;
public static final int CASING_REINFORCED = 1;
public static final int CASING_ADVANCED = 2;
public static final String STANDARD_CASING = "standard";
public static final String REINFORCED_CASING = "reinforced";
public static final String ADVANCED_CASING = "advanced";
private final World world;
private final BlockPos downCenter;
@ -46,10 +46,10 @@ public class MultiblockChecker {
this.downCenter = downCenter;
}
public boolean checkCasing(int offX, int offY, int offZ, int type) {
public boolean checkCasing(int offX, int offY, int offZ, String type) {
IBlockState block = getBlock(offX, offY, offZ);
if (block.getBlock() == ModBlocks.MACHINE_CASINGS) {
if (block.getValue(BlockMachineCasing.METADATA) == type)
if (block.getValue(BlockMachineCasing.TYPE).equals(type))
return true;
}
return false;
@ -65,7 +65,7 @@ public class MultiblockChecker {
return world.getBlockState(pos);
}
public boolean checkRectY(int sizeX, int sizeZ, int casingType, BlockPos offset) {
public boolean checkRectY(int sizeX, int sizeZ, String casingType, BlockPos offset) {
for (int x = -sizeX; x <= sizeX; x++) {
for (int z = -sizeZ; z <= sizeZ; z++) {
if (!checkCasing(x + offset.getX(), offset.getY(), z + offset.getZ(), casingType))
@ -75,7 +75,7 @@ public class MultiblockChecker {
return true;
}
public boolean checkRectZ(int sizeX, int sizeY, int casingType, BlockPos offset) {
public boolean checkRectZ(int sizeX, int sizeY, String casingType, BlockPos offset) {
for (int x = -sizeX; x <= sizeX; x++) {
for (int y = -sizeY; y <= sizeY; y++) {
if (!checkCasing(x + offset.getX(), y + offset.getY(), offset.getZ(), casingType))
@ -85,7 +85,7 @@ public class MultiblockChecker {
return true;
}
public boolean checkRectX(int sizeZ, int sizeY, int casingType, BlockPos offset) {
public boolean checkRectX(int sizeZ, int sizeY, String casingType, BlockPos offset) {
for (int z = -sizeZ; z <= sizeZ; z++) {
for (int y = -sizeY; y <= sizeY; y++) {
if (!checkCasing(offset.getX(), y + offset.getY(), z + offset.getZ(), casingType))
@ -95,7 +95,7 @@ public class MultiblockChecker {
return true;
}
public boolean checkRingY(int sizeX, int sizeZ, int casingType, BlockPos offset) {
public boolean checkRingY(int sizeX, int sizeZ, String casingType, BlockPos offset) {
for (int x = -sizeX; x <= sizeX; x++) {
for (int z = -sizeZ; z <= sizeZ; z++) {
if ((x == sizeX || x == -sizeX) || (z == sizeZ || z == -sizeZ)) {
@ -107,7 +107,7 @@ public class MultiblockChecker {
return true;
}
public boolean checkRingYHollow(int sizeX, int sizeZ, int casingType, BlockPos offset) {
public boolean checkRingYHollow(int sizeX, int sizeZ, String casingType, BlockPos offset) {
for (int x = -sizeX; x <= sizeX; x++) {
for (int z = -sizeZ; z <= sizeZ; z++) {
if ((x == sizeX || x == -sizeX) || (z == sizeZ || z == -sizeZ)) {

View file

@ -87,9 +87,9 @@ public class TileImplosionCompressor extends TilePowerAcceptor
}
public boolean getMutliBlock() {
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, MultiblockChecker.ZERO_OFFSET);
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, new BlockPos(0, 2, 0));
final boolean chamber = this.multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.CASING_REINFORCED, new BlockPos(0, 1, 0));
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET);
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 2, 0));
final boolean chamber = this.multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0));
return down && chamber && up;
}

View file

@ -105,11 +105,11 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha
if (multiblockChecker == null) {
return false;
}
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL,
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING,
MultiblockChecker.ZERO_OFFSET);
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL,
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING,
new BlockPos(0, 2, 0));
final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.CASING_REINFORCED,
final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING,
new BlockPos(0, 1, 0));
final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0);
final boolean center = centerBlock.getBlock() == Blocks.WATER;

View file

@ -121,11 +121,11 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
}
public boolean getMutliBlock() {
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL,
final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING,
MultiblockChecker.ZERO_OFFSET);
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL,
final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING,
new BlockPos(0, 2, 0));
final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.CASING_REINFORCED,
final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING,
new BlockPos(0, 1, 0));
final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0);
final boolean center = centerBlock.getBlock() == Blocks.WATER;

View file

@ -68,7 +68,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor
}
public boolean getMultiBlock() {
return this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, MultiblockChecker.ZERO_OFFSET);
return this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET);
}
@Override

View file

@ -34,10 +34,10 @@ import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileMFSU extends TileEnergyStorage implements IContainerProvider {
public class TileHighVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileMFSU() {
super("MFSU", 2, ModBlocks.HVSU, EnumPowerTier.HIGH, 2048, 2048, 1000000);
public TileHighVoltageSU() {
super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 2048, 2048, 1000000);
}
@Override

View file

@ -34,10 +34,10 @@ import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileBatBox extends TileEnergyStorage implements IContainerProvider {
public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileBatBox() {
super("BatBox", 2, ModBlocks.BATTERY_BOX, EnumPowerTier.LOW, 32, 32, 40000);
public TileLowVoltageSU() {
super("BatBox", 2, ModBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000);
}
@Override

View file

@ -34,10 +34,10 @@ import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileMFE extends TileEnergyStorage implements IContainerProvider {
public class TileMediumVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileMFE() {
super("MFE", 2, ModBlocks.MVSU, EnumPowerTier.MEDIUM, 512, 512, 600000);
public TileMediumVoltageSU() {
super("MEDIUM_VOLTAGE_SU", 2, ModBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 512, 512, 600000);
}
@Override

Some files were not shown because too many files have changed in this diff Show more