Begin the Great Refactor of Mid-2017

This commit is contained in:
Prospector 2017-06-13 16:49:52 -07:00
parent a4a4042eb1
commit 1fa9f1cf52
97 changed files with 328 additions and 1713 deletions

View file

@ -28,14 +28,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockComputerCube extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockComputerCube extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockComputerCube(final Material material) { public BlockComputerCube(final Material material) {
super(); super();
@ -50,25 +48,4 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota
player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "computer_cube";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "computer_cube";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "computer_cube";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "computer_cube";
}
} }

View file

@ -34,11 +34,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.BlockFluidBase;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileDigitalChest; import techreborn.tiles.TileDigitalChest;
import techreborn.tiles.TileTechStorageBase; import techreborn.tiles.TileTechStorageBase;
@ -46,14 +48,13 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockDigitalChest extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockDigitalChest() { public BlockDigitalChest() {
super(); super();
this.setUnlocalizedName("techreborn.digitalChest"); this.setUnlocalizedName("techreborn.digitalChest");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
@ -125,24 +126,4 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota
player.openGui(Core.INSTANCE, EGui.DIGITAL_CHEST.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.DIGITAL_CHEST.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "quantum_chest";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "qchest_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "quantum_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
} }

View file

@ -26,37 +26,13 @@ package techreborn.blocks;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockElectricCraftingTable extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockElectricCraftingTable extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockElectricCraftingTable(Material material) { public BlockElectricCraftingTable(Material material) {
super(); super();
setUnlocalizedName("techreborn.electriccraftingtable"); setUnlocalizedName("techreborn.electriccraftingtable");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public String getFront(boolean isActive) {
return prefix + "electric_crafting_table_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "machine_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "electric_crafting_table_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "machine_bottom";
}
} }

View file

@ -31,16 +31,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.utils.damageSources.FusionDamageSource; import techreborn.utils.damageSources.FusionDamageSource;
public class BlockFusionControlComputer extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockFusionControlComputer extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockFusionControlComputer(final Material material) { public BlockFusionControlComputer(final Material material) {
super(); super();
@ -74,24 +71,4 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
public TileEntity createNewTileEntity(final World world, final int meta) { public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileEntityFusionController(); return new TileEntityFusionController();
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "fusion_control_computer_front";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_side";
}
} }

View file

@ -37,9 +37,13 @@ import net.minecraft.util.NonNullList;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.multiblock.BlockMultiblockBase; import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMachineCasing;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
@ -50,12 +54,16 @@ public class BlockMachineCasing extends BlockMultiblockBase {
public static final String[] types = new String[] { "standard", "reinforced", "advanced" }; public static final String[] types = new String[] { "standard", "reinforced", "advanced" };
public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length); public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length);
public BlockMachineCasing(Material material) { public BlockMachineCasing() {
super(material); super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.machineCasing");
setHardness(2F); setHardness(2F);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); 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"));
}
} }
public static ItemStack getStackByName(String name, int count) { public static ItemStack getStackByName(String name, int count) {

View file

@ -24,7 +24,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyBool;
@ -39,7 +38,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion; import net.minecraft.world.Explosion;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.entities.EntityNukePrimed; import techreborn.entities.EntityNukePrimed;
@ -47,14 +45,13 @@ import techreborn.entities.EntityNukePrimed;
/** /**
* Created by Mark on 13/03/2016. * Created by Mark on 13/03/2016.
*/ */
public class BlockNuke extends BaseBlock implements ITexturedBlock { public class BlockNuke extends BaseBlock {
public static final PropertyBool OVERLAY = PropertyBool.create("overlay"); public static final PropertyBool OVERLAY = PropertyBool.create("overlay");
public BlockNuke() { public BlockNuke() {
super(Material.TNT); super(Material.TNT);
setUnlocalizedName("techreborn.nuke"); setUnlocalizedName("techreborn.nuke");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false)); this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
} }
@ -115,22 +112,6 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock {
return false; return false;
} }
@Override
public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) {
if (iBlockState.getValue(OVERLAY)) {
return "techreborn:blocks/nuke_front";
}
if (enumFacing == EnumFacing.UP || enumFacing == EnumFacing.DOWN) {
return "techreborn:blocks/nuke_top";
}
return "techreborn:blocks/nuke_side";
}
@Override
public int amountOfStates() {
return 2;
}
public int getMetaFromState(IBlockState state) { public int getMetaFromState(IBlockState state) {
return state.getValue(OVERLAY) ? 1 : 0; return state.getValue(OVERLAY) ? 1 : 0;
} }

View file

@ -41,6 +41,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.PropertyString; import reborncore.common.blocks.PropertyString;
import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
@ -62,25 +64,24 @@ import java.util.Random;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class BlockOre extends Block implements IOreNameProvider { public class BlockOre extends Block implements IOreNameProvider {
@ConfigRegistry(category = "blocks", key = "secondaryDropChance", comment = "Secondary Gem drop chance")
public static double secondaryDropChance = 0.5;
public static final String[] ores = new String[] { public static final String[] ores = new String[] {
"galena", "iridium", "ruby", "sapphire", "bauxite", "pyrite", "galena", "iridium", "ruby", "sapphire", "bauxite", "pyrite",
"cinnabar", "sphalerite", "tungsten", "sheldonite", "peridot", "sodalite", "cinnabar", "sphalerite", "tungsten", "sheldonite", "peridot", "sodalite",
"lead", "silver" }; "lead", "silver" };
private static final List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(ores)); private static final List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(ores));
public static final PropertyString VARIANTS = new PropertyString("type", oreNamesList); public static final PropertyString VARIANTS = new PropertyString("type", oreNamesList);
@ConfigRegistry(category = "blocks", key = "secondaryDropChance", comment = "Secondary Gem drop chance")
public static double secondaryDropChance = 0.5;
public BlockOre(Material material) { public BlockOre() {
super(material); super(Material.ROCK);
setUnlocalizedName("techreborn.ore");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0f); setHardness(2.0f);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);
this.setDefaultState(this.getStateFromMeta(0)); 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"));
}
} }
public static ItemStack getOreByName(String name, int count) { public static ItemStack getOreByName(String name, int count) {

View file

@ -38,11 +38,14 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.PropertyString; import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils; import reborncore.common.util.ArrayUtils;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import techreborn.world.config.IOreNameProvider; import techreborn.world.config.IOreNameProvider;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
@ -54,13 +57,15 @@ public class BlockOre2 extends Block implements IOreNameProvider {
static List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(ores)); static List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(ores));
public PropertyString VARIANTS = new PropertyString("type", oreNamesList); public PropertyString VARIANTS = new PropertyString("type", oreNamesList);
public BlockOre2(Material material) { public BlockOre2() {
super(material); super(Material.ROCK);
setUnlocalizedName("techreborn.ore2");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0f); setHardness(2.0f);
setHarvestLevel("pickaxe", 1); setHarvestLevel("pickaxe", 1);
this.setDefaultState(this.getStateFromMeta(0)); 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"));
}
} }
public static ItemStack getOreByName(String name, int count) { public static ItemStack getOreByName(String name, int count) {

View file

@ -25,7 +25,6 @@
package techreborn.blocks; package techreborn.blocks;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -45,6 +44,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.PropertyString; import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils; import reborncore.common.util.ArrayUtils;
@ -52,23 +53,26 @@ import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.MessageIDs; import techreborn.lib.MessageIDs;
import techreborn.lib.ModInfo;
import techreborn.tiles.TilePlayerDectector; import techreborn.tiles.TilePlayerDectector;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBlock { public class BlockPlayerDetector extends BlockMachineBase {
public static final String[] types = new String[] { "all", "others", "you" }; public static final String[] types = new String[] { "all", "others", "you" };
public PropertyString TYPE;
static List<String> typeNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); static List<String> typeNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public PropertyString TYPE;
public BlockPlayerDetector() { public BlockPlayerDetector() {
super(true); super(true);
setUnlocalizedName("techreborn.playerDetector");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f); setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "all")); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "all"));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
}
} }
@Override @Override
@ -151,16 +155,6 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
return true; return true;
} }
@Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machines/tier1_machines/player_detector_" + types[getMetaFromState(blockState)].toLowerCase();
}
@Override
public int amountOfStates() {
return types.length;
}
protected BlockStateContainer createBlockState() { protected BlockStateContainer createBlockState() {
TYPE = new PropertyString("type", types); TYPE = new PropertyString("type", types);
return new BlockStateContainer(this, TYPE); return new BlockStateContainer(this, TYPE);

View file

@ -37,11 +37,13 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.BlockFluidBase;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileTechStorageBase; import techreborn.tiles.TileTechStorageBase;
@ -49,15 +51,14 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockQuantumChest extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockQuantumChest() { public BlockQuantumChest() {
super(); super();
this.setUnlocalizedName("techreborn.quantumChest"); this.setUnlocalizedName("techreborn.quantumChest");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
this.setHardness(2.0F); this.setHardness(2.0F);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
} }
@Override @Override
@ -129,24 +130,4 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota
playerIn.openGui(Core.INSTANCE, EGui.QUANTUM_CHEST.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ()); playerIn.openGui(Core.INSTANCE, EGui.QUANTUM_CHEST.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ());
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "quantum_chest";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "qchest_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "quantum_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
} }

View file

@ -28,22 +28,22 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileQuantumTank;
public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockQuantumTank extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockQuantumTank() { public BlockQuantumTank() {
super(); super();
this.setUnlocalizedName("techreborn.quantumTank");
this.setHardness(2.0F); this.setHardness(2.0F);
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
} }
@Override @Override
@ -62,24 +62,4 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
} }
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return "techreborn:blocks/machine/generators/thermal_generator_side_off";
}
@Override
public String getSide(final boolean isActive) {
return "techreborn:blocks/machine/generators/thermal_generator_side_off";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "quantum_top";
}
@Override
public String getBottom(final boolean isActive) {
return "techreborn:blocks/machine/generators/thermal_generator_bottom";
}
} }

View file

@ -24,19 +24,15 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
public class BlockReinforcedGlass extends BaseBlock implements ITexturedBlock { public class BlockReinforcedGlass extends BaseBlock {
private final String prefix = "techreborn:blocks/";
public BlockReinforcedGlass(Material materialIn) { public BlockReinforcedGlass(Material materialIn) {
super(materialIn); super(materialIn);
@ -59,14 +55,4 @@ public class BlockReinforcedGlass extends BaseBlock implements ITexturedBlock {
return false; return false;
} }
@Override
public int amountOfStates() {
return 1;
}
@Override
public String getTextureNameFromState(IBlockState arg0, EnumFacing arg1) {
return prefix + "reinforced_glass";
}
} }

View file

@ -24,8 +24,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.IOpaqueBlock;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPlanks;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
@ -35,12 +33,10 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -50,13 +46,12 @@ import java.util.Random;
/** /**
* Created by modmuss50 on 20/02/2016. * Created by modmuss50 on 20/02/2016.
*/ */
public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IOpaqueBlock { public class BlockRubberLeaves extends BlockLeaves {
public BlockRubberLeaves() { public BlockRubberLeaves() {
super(); super();
setUnlocalizedName("techreborn.rubberleaves"); setUnlocalizedName("techreborn.rubberleaves");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, true)); .withProperty(DECAYABLE, true));
Blocks.FIRE.setFireInfo(this, 30, 60); Blocks.FIRE.setFireInfo(this, 30, 60);
@ -88,25 +83,6 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
return false; return false;
} }
//TODO 1.11: what is this?
// @Override
// protected ItemStack createStackedBlock(IBlockState state) {
// IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE,
// false);
//
// return super.createStackedBlock(newState);
// }
@Override
public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) {
return "techreborn:blocks/rubber_leaves";
}
@Override
public int amountOfStates() {
return 4;
}
@Override @Override
protected BlockStateContainer createBlockState() { protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, new IProperty[] { CHECK_DECAY, DECAYABLE }); return new BlockStateContainer(this, new IProperty[] { CHECK_DECAY, DECAYABLE });

View file

@ -24,7 +24,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -42,7 +41,6 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
@ -57,7 +55,7 @@ import java.util.Random;
/** /**
* Created by modmuss50 on 19/02/2016. * Created by modmuss50 on 19/02/2016.
*/ */
public class BlockRubberLog extends Block implements ITexturedBlock { public class BlockRubberLog extends Block {
public static PropertyDirection SAP_SIDE = PropertyDirection.create("sapside", EnumFacing.Plane.HORIZONTAL); public static PropertyDirection SAP_SIDE = PropertyDirection.create("sapside", EnumFacing.Plane.HORIZONTAL);
public static PropertyBool HAS_SAP = PropertyBool.create("hassap"); public static PropertyBool HAS_SAP = PropertyBool.create("hassap");
@ -67,7 +65,6 @@ public class BlockRubberLog extends Block implements ITexturedBlock {
setUnlocalizedName("techreborn.rubberlog"); setUnlocalizedName("techreborn.rubberlog");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F); this.setHardness(2.0F);
RebornCore.jsonDestroyer.registerObject(this);
this.setDefaultState( this.setDefaultState(
this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false)); this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false));
this.setTickRandomly(true); this.setTickRandomly(true);
@ -114,24 +111,6 @@ public class BlockRubberLog extends Block implements ITexturedBlock {
return tempMeta; return tempMeta;
} }
@Override
public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) {
if (enumFacing == EnumFacing.DOWN || enumFacing == EnumFacing.UP) {
return "techreborn:blocks/rubber_log_top";
}
if (IBlockState.getValue(HAS_SAP)) {
if (IBlockState.getValue(SAP_SIDE) == enumFacing) {
return "techreborn:blocks/rubber_log_sap";
}
}
return "techreborn:blocks/rubber_log_side";
}
@Override
public int amountOfStates() {
return 8;
}
@Override @Override
public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) {
return true; return true;

View file

@ -24,38 +24,23 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing;
import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
/** /**
* Created by modmuss50 on 20/02/2016. * Created by modmuss50 on 20/02/2016.
*/ */
public class BlockRubberPlank extends Block implements ITexturedBlock { public class BlockRubberPlank extends Block {
public BlockRubberPlank() { public BlockRubberPlank() {
super(Material.WOOD); super(Material.WOOD);
RebornCore.jsonDestroyer.registerObject(this);
setUnlocalizedName("techreborn.rubberplank"); setUnlocalizedName("techreborn.rubberplank");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F); this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD); this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20); Blocks.FIRE.setFireInfo(this, 5, 20);
} }
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
return "techreborn:blocks/rubber_planks";
}
@Override
public int amountOfStates() {
return 1;
}
} }

View file

@ -24,7 +24,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
@ -32,28 +31,32 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.util.Random; import java.util.Random;
public class BlockStorage extends BaseBlock implements ITexturedBlock { public class BlockStorage extends BaseBlock {
public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass", public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass",
"lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" }; "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" };
public PropertyInteger METADATA; public PropertyInteger METADATA;
public BlockStorage(Material material) { public BlockStorage() {
super(material); super(Material.IRON);
setUnlocalizedName("techreborn.storage");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f); setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage"));
}
} }
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
@ -87,16 +90,6 @@ public class BlockStorage extends BaseBlock implements ITexturedBlock {
return getMetaFromState(state); return getMetaFromState(state);
} }
@Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block";
}
@Override
public int amountOfStates() {
return types.length;
}
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMeta(int meta) {
if (meta > types.length) { if (meta > types.length) {

View file

@ -24,7 +24,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
@ -32,30 +31,34 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.Random; import java.util.Random;
public class BlockStorage2 extends BaseBlock implements ITexturedBlock { public class BlockStorage2 extends BaseBlock {
public static final String[] types = new String[] { "tungstensteel", public static final String[] types = new String[] { "tungstensteel",
"iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot", "iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot",
"yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" }; "yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" };
public PropertyInteger METADATA; public PropertyInteger METADATA;
public BlockStorage2(Material material) { public BlockStorage2() {
super(material); super(Material.IRON);
setUnlocalizedName("techreborn.storage2");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f); setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage"));
}
} }
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
@ -85,16 +88,6 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock {
return getMetaFromState(state); return getMetaFromState(state);
} }
@Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block";
}
@Override
public int amountOfStates() {
return types.length;
}
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMeta(int meta) {
if (meta > types.length) { if (meta > types.length) {

View file

@ -26,37 +26,12 @@ package techreborn.blocks;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockSupercondensator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockSupercondensator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockSupercondensator(Material material) { public BlockSupercondensator(Material material) {
super(); super();
setUnlocalizedName("techreborn.supercondensator"); setUnlocalizedName("techreborn.supercondensator");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public String getFront(boolean isActive) {
return prefix + "supercondensator_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "supercondensator_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "supercondensator_side";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "machine_bottom";
}
} }

View file

@ -30,8 +30,6 @@ import techreborn.client.TechRebornCreativeTab;
public class BlockDistillationTower extends BlockMachineBase { public class BlockDistillationTower extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/";
public BlockDistillationTower(Material material) { public BlockDistillationTower(Material material) {
super(); super();
setUnlocalizedName("techreborn.distillationtower"); setUnlocalizedName("techreborn.distillationtower");

View file

@ -28,21 +28,21 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileImplosionCompressor; import techreborn.tiles.multiblock.TileImplosionCompressor;
public class BlockImplosionCompressor extends BlockMachineBase implements IRotationTexture { public class BlockImplosionCompressor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/"; public BlockImplosionCompressor() {
public BlockImplosionCompressor(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.implosioncompressor");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
@ -57,29 +57,4 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat
player.openGui(Core.INSTANCE, EGui.IMPLOSION_COMPRESSOR.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.IMPLOSION_COMPRESSOR.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "implosion_compressor_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "implosion_compressor_front_on";
}
@Override
public String getSide() {
return this.prefix + "advanced_machine_side";
}
@Override
public String getTop() {
return this.prefix + "industrial_centrifuge_top_off";
}
@Override
public String getBottom() {
return this.prefix + "implosion_compressor_bottom";
}
} }

View file

@ -24,30 +24,29 @@
package techreborn.blocks.advanced_machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.multiblock.TileBlastFurnace; import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
public class BlockBlastFurnace extends BlockMachineBase implements IRotationTexture { public class BlockIndustrialBlastFurnace extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/"; public BlockIndustrialBlastFurnace() {
public BlockBlastFurnace(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.blastfurnace");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileBlastFurnace(); return new TileIndustrialBlastFurnace();
} }
@Override @Override
@ -62,29 +61,4 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText
public boolean isAdvanced() { public boolean isAdvanced() {
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "industrial_blast_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "industrial_blast_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "advanced_machine_side";
}
@Override
public String getTop() {
return this.prefix + "advanced_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "advanced_machine_bottom";
}
} }

View file

@ -27,26 +27,28 @@ package techreborn.blocks.advanced_machine;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileCentrifuge; import techreborn.lib.ModInfo;
import techreborn.tiles.TileIndustrialCentrifuge;
public class BlockCentrifuge extends BlockMachineBase implements IRotationTexture { public class BlockIndustrialCentrifuge extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
public BlockCentrifuge() { public BlockIndustrialCentrifuge() {
super(); super();
this.setUnlocalizedName("techreborn.centrifuge");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
return new TileCentrifuge(); return new TileIndustrialCentrifuge();
} }
@Override @Override
@ -57,29 +59,4 @@ public class BlockCentrifuge extends BlockMachineBase implements IRotationTextur
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "industrial_centrifuge_side_off";
}
@Override
public String getFrontOn() {
return this.prefix + "industrial_centrifuge_side_on";
}
@Override
public String getSide() {
return this.getFrontOff();
}
@Override
public String getTop() {
return this.prefix + "industrial_centrifuge_top_off";
}
@Override
public String getBottom() {
return this.prefix + "industrial_centrifuge_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileIndustrialElectrolyzer; import techreborn.tiles.TileIndustrialElectrolyzer;
public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRotationTexture { public class BlockIndustrialElectrolyzer extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockIndustrialElectrolyzer(final Material material) { public BlockIndustrialElectrolyzer(final Material material) {
super(); super();
@ -57,29 +54,4 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo
player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_ELECTROLYZER.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_ELECTROLYZER.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "industrial_electrolyzer_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "industrial_electrolyzer_front_on";
}
@Override
public String getSide() {
return this.prefix + "industrial_electrolyzer_front_off";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "machine_bottom";
}
} }

View file

@ -29,21 +29,21 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialGrinder; import techreborn.tiles.multiblock.TileIndustrialGrinder;
public class BlockIndustrialGrinder extends BlockMachineBase implements IRotationTexture { public class BlockIndustrialGrinder extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/"; public BlockIndustrialGrinder() {
public BlockIndustrialGrinder(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.industrialgrinder");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
@ -61,29 +61,4 @@ public class BlockIndustrialGrinder extends BlockMachineBase implements IRotatio
player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_GRINDER.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_GRINDER.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "industrial_grinder_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "industrial_grinder_front_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "industrial_grinder_top_off";
}
@Override
public String getBottom() {
return this.prefix + "industrial_centrifuge_bottom";
}
} }

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.multiblock.TileIndustrialSawmill; import techreborn.tiles.multiblock.TileIndustrialSawmill;
public class BlockIndustrialSawmill extends BlockMachineBase implements IRotationTexture { public class BlockIndustrialSawmill extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/advanced_machines/";
public BlockIndustrialSawmill(final Material material) { public BlockIndustrialSawmill(final Material material) {
super(); super();
@ -61,29 +58,4 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio
player.openGui(Core.INSTANCE, EGui.SAWMILL.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.SAWMILL.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "industrial_sawmill_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "industrial_sawmill_front_on";
}
@Override
public String getSide() {
return this.prefix + "advanced_machine_side";
}
@Override
public String getTop() {
return this.prefix + "advanced_machine_side";
}
@Override
public String getBottom() {
return this.prefix + "advanced_machine_side";
}
} }

View file

@ -68,7 +68,6 @@ public class BlockCable extends BlockContainer {
public BlockCable() { public BlockCable() {
super(Material.ROCK); super(Material.ROCK);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.cable");
setDefaultState(getDefaultState().withProperty(EAST, false).withProperty(WEST, false).withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(UP, false).withProperty(DOWN, false).withProperty(TYPE, EnumCableType.COPPER)); setDefaultState(getDefaultState().withProperty(EAST, false).withProperty(WEST, false).withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(UP, false).withProperty(DOWN, false).withProperty(TYPE, EnumCableType.COPPER));
} }

View file

@ -24,12 +24,11 @@
package techreborn.blocks.fluid; package techreborn.blocks.fluid;
import me.modmuss50.jsonDestroyer.api.ITexturedFluid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import techreborn.Core; import techreborn.Core;
public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFluid { public class BlockFluidTechReborn extends BlockFluidBase {
String name; String name;

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDieselGenerator; import techreborn.tiles.generator.TileDieselGenerator;
public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockDieselGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockDieselGenerator(final Material material) { public BlockDieselGenerator(final Material material) {
super(); super();
@ -61,25 +58,4 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
player.openGui(Core.INSTANCE, EGui.DIESEL_GENERATOR.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.DIESEL_GENERATOR.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "diesel_generator_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
} }

View file

@ -31,15 +31,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDragonEggSiphoner; import techreborn.tiles.generator.TileDragonEggSiphoner;
import java.util.List; import java.util.List;
public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockDragonEggSiphoner extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockDragonEggSiphoner(Material material) { public BlockDragonEggSiphoner(Material material) {
super(); super();
@ -52,26 +49,6 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
return new TileDragonEggSiphoner(); return new TileDragonEggSiphoner();
} }
@Override
public String getFront(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getTop(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}
@Override @Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) { public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon"); tooltip.add(TextFormatting.RED + "WIP Coming Soon");

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGasTurbine; import techreborn.tiles.generator.TileGasTurbine;
public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockGasTurbine extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockGasTurbine(final Material material) { public BlockGasTurbine(final Material material) {
super(); super();
@ -62,24 +59,4 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "gas_generator_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "gas_generator_bottom";
}
} }

View file

@ -28,15 +28,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGenerator; import techreborn.tiles.generator.TileGenerator;
public class BlockGenerator extends BlockMachineBase implements IRotationTexture { public class BlockGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockGenerator() { public BlockGenerator() {
super(); super();
@ -57,29 +54,4 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "generator_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "generator_front_on";
}
@Override
public String getSide() {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop() {
return this.prefix + "generator_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "generator_machine_bottom";
}
} }

View file

@ -31,15 +31,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileHeatGenerator; import techreborn.tiles.generator.TileHeatGenerator;
import java.util.List; import java.util.List;
public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockHeatGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockHeatGenerator(Material material) { public BlockHeatGenerator(Material material) {
super(); super();
@ -52,30 +49,4 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot
return new TileHeatGenerator(); return new TileHeatGenerator();
} }
@Override
public String getFront(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getSide(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "heat_generator_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "heat_generator_bottom";
}
@Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
//TODO Finish Heat Generator and add recipe + texture
//Remember to remove WIP override and imports once complete
}
} }

View file

@ -26,12 +26,9 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockMagicEnergyAbsorber extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockMagicEnergyAbsorber(Material material) { public BlockMagicEnergyAbsorber(Material material) {
super(); super();
@ -39,24 +36,4 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvan
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public String getFront(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getSide(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "magic_energy_absorber_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "magic_energy_absorber_bottom";
}
} }

View file

@ -26,37 +26,13 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockMagicEnergyConverter extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockMagicEnergyConverter(Material material) { public BlockMagicEnergyConverter(Material material) {
super(); super();
setUnlocalizedName("techreborn.magicenergyconverter"); setUnlocalizedName("techreborn.magicenergyconverter");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public String getFront(boolean isActive) {
return prefix + "magic_energy_converter_front_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "magic_energy_converter_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "magic_energy_converter_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "magic_energy_converter_bottom";
}
} }

View file

@ -26,36 +26,13 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockPlasmaGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockPlasmaGenerator(Material material) { public BlockPlasmaGenerator(Material material) {
super(); super();
setUnlocalizedName("techreborn.plasmagenerator"); setUnlocalizedName("techreborn.plasmagenerator");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public String getFront(boolean isActive) {
return prefix + "plasma_generator_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
} }

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileSemifluidGenerator; import techreborn.tiles.generator.TileSemifluidGenerator;
public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockSemiFluidGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockSemiFluidGenerator(final Material material) { public BlockSemiFluidGenerator(final Material material) {
super(); super();
@ -61,25 +58,4 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
player.openGui(Core.INSTANCE, EGui.SEMIFLUID_GENERATOR.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.SEMIFLUID_GENERATOR.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "semifluid_generator_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "semifluid_generator_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "generator_machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
} }

View file

@ -28,21 +28,21 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileThermalGenerator; import techreborn.tiles.generator.TileThermalGenerator;
public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockThermalGenerator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockThermalGenerator() { public BlockThermalGenerator() {
super(); super();
this.setUnlocalizedName("techreborn.thermalGenerator");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
} }
@Override @Override
@ -60,24 +60,4 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
player.openGui(Core.INSTANCE, EGui.THERMAL_GENERATOR.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.THERMAL_GENERATOR.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_side_on" : this.prefix + "thermal_generator_side_off";
}
@Override
public String getSide(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_side_on" : this.prefix + "thermal_generator_side_off";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_top_on" : this.prefix + "thermal_generator_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
} }

View file

@ -44,7 +44,6 @@ public class BlockWaterMill extends BaseTileBlock {
setUnlocalizedName("techreborn.watermill"); setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F); setHardness(2.0F);
RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override

View file

@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -42,9 +41,7 @@ import techreborn.tiles.TileAlloyFurnace;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class BlockAlloyFurnace extends BlockMachineBase implements IRotationTexture { public class BlockAlloyFurnace extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/iron_machines/";
public BlockAlloyFurnace(final Material material) { public BlockAlloyFurnace(final Material material) {
super(); super();
@ -71,29 +68,4 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText
items.add(new ItemStack(this)); items.add(new ItemStack(this));
return items; return items;
} }
@Override
public String getFrontOff() {
return this.prefix + "alloy_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "alloy_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "iron_machine_side";
}
@Override
public String getTop() {
return this.prefix + "iron_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "iron_machine_bottom";
}
} }

View file

@ -36,7 +36,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -46,9 +45,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockIronFurnace extends BlockMachineBase implements IRotationTexture { public class BlockIronFurnace extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/iron_machines/";
public BlockIronFurnace() { public BlockIronFurnace() {
super(); super();
@ -110,29 +107,4 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu
} }
} }
} }
@Override
public String getFrontOff() {
return this.prefix + "iron_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "iron_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "iron_machine_side";
}
@Override
public String getTop() {
return this.prefix + "iron_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "iron_machine_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAssemblingMachine; import techreborn.tiles.TileAssemblingMachine;
public class BlockAssemblingMachine extends BlockMachineBase implements IRotationTexture { public class BlockAssemblingMachine extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockAssemblingMachine(final Material material) { public BlockAssemblingMachine(final Material material) {
super(); super();
@ -57,29 +54,4 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio
player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "assembling_machine_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "assembling_machine_front_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "assembling_machine_top";
}
} }

View file

@ -24,30 +24,29 @@
package techreborn.blocks.machine; package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileChargeBench; import techreborn.lib.ModInfo;
import techreborn.tiles.TileChargeOMat;
public class BlockChargeBench extends BlockMachineBase implements IRotationTexture { public class BlockChargeOMat extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/"; public BlockChargeOMat() {
public BlockChargeBench(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.chargebench");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
} }
@Override @Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileChargeBench(); return new TileChargeOMat();
} }
@Override @Override
@ -57,29 +56,4 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu
player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "chargeBench_side";
}
@Override
public String getFrontOn() {
return this.prefix + "chargeBench_side";
}
@Override
public String getSide() {
return this.prefix + "chargeBench_side";
}
@Override
public String getTop() {
return this.prefix + "chargeBench_side";
}
@Override
public String getBottom() {
return this.prefix + "chargeBench_side";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileChemicalReactor; import techreborn.tiles.TileChemicalReactor;
public class BlockChemicalReactor extends BlockMachineBase implements IRotationTexture { public class BlockChemicalReactor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChemicalReactor(final Material material) { public BlockChemicalReactor(final Material material) {
super(); super();
@ -57,29 +54,4 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "chemical_reactor_side_off";
}
@Override
public String getFrontOn() {
return this.prefix + "chemical_reactor_side_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "chemical_reactor_bottom";
}
} }

View file

@ -28,21 +28,21 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChunkLoader; import techreborn.tiles.TileChunkLoader;
public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockChunkLoader extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/"; public BlockChunkLoader() {
public BlockChunkLoader(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.chunkloader");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
} }
@Override @Override
@ -57,24 +57,4 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat
player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
} }

View file

@ -28,21 +28,21 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileMatterFabricator; import techreborn.tiles.TileMatterFabricator;
public class BlockMatterFabricator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockMatterFabricator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/"; public BlockMatterFabricator() {
public BlockMatterFabricator(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.matterfabricator");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
} }
@Override @Override
@ -62,24 +62,4 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
public boolean isAdvanced() { public boolean isAdvanced() {
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getSide(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getBottom(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
} }

View file

@ -24,25 +24,24 @@
package techreborn.blocks.machine; package techreborn.blocks.machine;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileRollingMachine; import techreborn.tiles.TileRollingMachine;
public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockRollingMachine extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/"; public BlockRollingMachine() {
public BlockRollingMachine(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.rollingmachine");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
} }
@Override @Override
@ -57,24 +56,4 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo
player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "rolling_machine_side_on" : this.prefix + "rolling_machine_side_off";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
} }

View file

@ -32,7 +32,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -40,9 +39,7 @@ import techreborn.tiles.TileScrapboxinator;
import java.util.List; import java.util.List;
public class BlockScrapboxinator extends BlockMachineBase implements IRotationTexture { public class BlockScrapboxinator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockScrapboxinator(final Material material) { public BlockScrapboxinator(final Material material) {
super(); super();
@ -64,31 +61,6 @@ public class BlockScrapboxinator extends BlockMachineBase implements IRotationTe
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "scrapboxinator_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "scrapboxinator_front_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "machine_bottom";
}
@Override @Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) { public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon"); tooltip.add(TextFormatting.RED + "WIP Coming Soon");

View file

@ -33,15 +33,12 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.multiblock.TileVacuumFreezer; import techreborn.tiles.multiblock.TileVacuumFreezer;
public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockVacuumFreezer extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockVacuumFreezer(final Material material) { public BlockVacuumFreezer(final Material material) {
super(); super();
@ -70,24 +67,4 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot
} }
return false; return false;
} }
@Override
public String getFront(final boolean isActive) {
return this.prefix + "vacuum_freezer_front";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "vacuum_freezer_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
} }

View file

@ -26,7 +26,6 @@ package techreborn.blocks.storage;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
@ -39,7 +38,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -49,7 +47,7 @@ import java.util.Random;
/** /**
* Created by Rushmead * Created by Rushmead
*/ */
public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotationTexture, ITexturedBlock { public abstract class BlockEnergyStorage extends BaseTileBlock {
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL); public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
protected final String prefix = "techreborn:blocks/machines/energy/"; protected final String prefix = "techreborn:blocks/machines/energy/";
public String name; public String name;
@ -141,80 +139,10 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
return 0; return 0;
} }
@Override
public String getFrontOff() {
return prefix + getSimpleName(name.toLowerCase()) + "_front";
}
@Override
public String getFrontOn() {
return prefix + getSimpleName(name.toLowerCase()) + "_front";
}
@Override
public String getSide() {
return prefix + getSimpleName(name.toLowerCase()) + "_side";
}
@Override
public String getTop() {
return prefix + getSimpleName(name.toLowerCase()) + "_side";
}
@Override
public String getBottom() {
return prefix + getSimpleName(name.toLowerCase()) + "_side";
}
@Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
if (this instanceof IRotationTexture) {
IRotationTexture rotationTexture = this;
if (getFacing(blockState) == facing) {
return rotationTexture.getFrontOff();
}
if (facing == EnumFacing.UP) {
return rotationTexture.getTop();
}
if (facing == EnumFacing.DOWN) {
return rotationTexture.getBottom();
}
return rotationTexture.getSide();
}
return "techreborn:blocks/machine/machine_side";
}
public EnumFacing getFacing(IBlockState state) { public EnumFacing getFacing(IBlockState state) {
return state.getValue(FACING); return state.getValue(FACING);
} }
@Override
public int amountOfStates() {
return 6;
}
public enum Facings implements Predicate<EnumFacing>, Iterable<EnumFacing> {
ALL;
public EnumFacing[] facings() {
return new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST,
EnumFacing.UP, EnumFacing.DOWN };
}
public EnumFacing random(Random rand) {
EnumFacing[] aenumfacing = this.facings();
return aenumfacing[rand.nextInt(aenumfacing.length)];
}
public boolean apply(EnumFacing p_apply_1_) {
return p_apply_1_ != null;
}
public Iterator<EnumFacing> iterator() {
return Iterators.forArray(this.facings());
}
}
public String getSimpleName(String fullName) { public String getSimpleName(String fullName) {
if (fullName.equalsIgnoreCase("Batbox")) { if (fullName.equalsIgnoreCase("Batbox")) {
return "lv_storage"; return "lv_storage";
@ -237,4 +165,26 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
return fullName.toLowerCase(); return fullName.toLowerCase();
} }
public enum Facings implements Predicate<EnumFacing>, Iterable<EnumFacing> {
ALL;
public EnumFacing[] facings() {
return new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST,
EnumFacing.UP, EnumFacing.DOWN };
}
public EnumFacing random(Random rand) {
EnumFacing[] aenumfacing = this.facings();
return aenumfacing[rand.nextInt(aenumfacing.length)];
}
public boolean apply(EnumFacing p_apply_1_) {
return p_apply_1_ != null;
}
public Iterator<EnumFacing> iterator() {
return Iterators.forArray(this.facings());
}
}
} }

View file

@ -28,21 +28,21 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileAlloySmelter;
public class BlockAlloySmelter extends BlockMachineBase implements IRotationTexture { public class BlockAlloySmelter extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/"; public BlockAlloySmelter() {
public BlockAlloySmelter(final Material material) {
super(); super();
this.setUnlocalizedName("techreborn.alloysmelter");
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
} }
@Override @Override
@ -57,29 +57,4 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText
player.openGui(Core.INSTANCE, EGui.ALLOY_SMELTER.ordinal(), world, x, y, z); player.openGui(Core.INSTANCE, EGui.ALLOY_SMELTER.ordinal(), world, x, y, z);
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "electric_alloy_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "electric_alloy_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -29,13 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileCompressor; import techreborn.tiles.teir1.TileCompressor;
public class BlockCompressor extends BlockMachineBase implements IRotationTexture { public class BlockCompressor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@ -58,29 +57,4 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "compressor_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "compressor_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileElectricFurnace; import techreborn.tiles.teir1.TileElectricFurnace;
public class BlockElectricFurnace extends BlockMachineBase implements IRotationTexture { public class BlockElectricFurnace extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockElectricFurnace(final Material material) { public BlockElectricFurnace(final Material material) {
super(); super();
@ -58,29 +55,4 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "electric_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "electric_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileExtractor; import techreborn.tiles.teir1.TileExtractor;
public class BlockExtractor extends BlockMachineBase implements IRotationTexture { public class BlockExtractor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockExtractor(final Material material) { public BlockExtractor(final Material material) {
super(); super();
@ -58,29 +55,4 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "extractor_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "extractor_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileGrinder; import techreborn.tiles.teir1.TileGrinder;
public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockGrinder extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockGrinder(final Material material) { public BlockGrinder(final Material material) {
super(); super();
@ -58,25 +55,4 @@ public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationT
} }
return true; return true;
} }
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "grinder_front_on" : this.prefix + "grinder_front_off";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "grinder_top_on" : this.prefix + "grinder_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -29,15 +29,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileRecycler; import techreborn.tiles.teir1.TileRecycler;
public class BlockRecycler extends BlockMachineBase implements IRotationTexture { public class BlockRecycler extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockRecycler(final Material material) { public BlockRecycler(final Material material) {
super(); super();
@ -58,29 +55,4 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture
} }
return true; return true;
} }
@Override
public String getFrontOff() {
return this.prefix + "recycler_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "recycler_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
} }

View file

@ -26,7 +26,6 @@ package techreborn.blocks.transformers;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid; import net.minecraft.block.BlockStaticLiquid;
@ -45,7 +44,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.BlockFluidBase;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.IRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import java.util.ArrayList; import java.util.ArrayList;
@ -56,7 +54,7 @@ import java.util.Random;
/** /**
* Created by Rushmead * Created by Rushmead
*/ */
public abstract class BlockTransformer extends BaseTileBlock implements IRotationTexture, ITexturedBlock { public abstract class BlockTransformer extends BaseTileBlock {
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL); public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
protected final String prefix = "techreborn:blocks/machines/energy/"; protected final String prefix = "techreborn:blocks/machines/energy/";
public String name; public String name;
@ -210,58 +208,10 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
return 0; return 0;
} }
@Override
public String getFrontOff() {
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_front";
}
@Override
public String getFrontOn() {
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_front";
}
@Override
public String getSide() {
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
}
@Override
public String getTop() {
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
}
@Override
public String getBottom() {
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
}
@Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
if (this instanceof IRotationTexture) {
IRotationTexture rotationTexture = this;
if (getFacing(blockState) == facing) {
return rotationTexture.getFrontOff();
}
if (facing == EnumFacing.UP) {
return rotationTexture.getTop();
}
if (facing == EnumFacing.DOWN) {
return rotationTexture.getBottom();
}
return rotationTexture.getSide();
}
return "techreborn:blocks/machine/machine_side";
}
public EnumFacing getFacing(IBlockState state) { public EnumFacing getFacing(IBlockState state) {
return state.getValue(FACING); return state.getValue(FACING);
} }
@Override
public int amountOfStates() {
return 6;
}
public enum Facings implements Predicate<EnumFacing>, Iterable<EnumFacing> { public enum Facings implements Predicate<EnumFacing>, Iterable<EnumFacing> {
ALL; ALL;

View file

@ -86,11 +86,11 @@ public class GuiHandler implements IGuiHandler {
case BATBOX: case BATBOX:
return new GuiBatbox(player, (TileBatBox) tile); return new GuiBatbox(player, (TileBatBox) tile);
case BLAST_FURNACE: case BLAST_FURNACE:
return new GuiBlastFurnace(player, (TileBlastFurnace) tile); return new GuiBlastFurnace(player, (TileIndustrialBlastFurnace) tile);
case CENTRIFUGE: case CENTRIFUGE:
return new GuiCentrifuge(player, (TileCentrifuge) tile); return new GuiCentrifuge(player, (TileIndustrialCentrifuge) tile);
case CHARGEBENCH: case CHARGEBENCH:
return new GuiChargeBench(player, (TileChargeBench) tile); return new GuiChargeBench(player, (TileChargeOMat) tile);
case CHEMICAL_REACTOR: case CHEMICAL_REACTOR:
return new GuiChemicalReactor(player, (TileChemicalReactor) tile); return new GuiChemicalReactor(player, (TileChemicalReactor) tile);
case CHUNK_LOADER: case CHUNK_LOADER:

View file

@ -37,16 +37,16 @@ import reborncore.common.misc.Location;
import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileBlastFurnace; import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
import java.io.IOException; import java.io.IOException;
public class GuiBlastFurnace extends GuiBase { public class GuiBlastFurnace extends GuiBase {
public TileBlastFurnace tile; public TileIndustrialBlastFurnace tile;
boolean hasMultiBlock; boolean hasMultiBlock;
public GuiBlastFurnace(final EntityPlayer player, final TileBlastFurnace tile) { public GuiBlastFurnace(final EntityPlayer player, final TileIndustrialBlastFurnace tile) {
super(player, tile, tile.createContainer(player)); super(player, tile, tile.createContainer(player));
this.tile = tile; this.tile = tile;
} }

View file

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

View file

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

View file

@ -40,9 +40,7 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.fuel.FluidPowerManager; import reborncore.api.fuel.FluidPowerManager;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
import techreborn.dev.JsonGenerator;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -106,13 +104,6 @@ public class TechRebornDevCommand extends CommandBase {
} else { } else {
sender.sendMessage(new TextComponentString("hold an item!")); sender.sendMessage(new TextComponentString("hold an item!"));
} }
} else if ("gen".equals(args[0])) {
try {
new JsonGenerator().generate();
} catch (IOException e) {
e.printStackTrace();
sender.sendMessage(new TextComponentString(e.getLocalizedMessage()));
}
} else if ("ores".equals(args[0])) { } else if ("ores".equals(args[0])) {
for (String ore : OreDictionary.getOreNames()) { for (String ore : OreDictionary.getOreNames()) {
System.out.println(ore); System.out.println(ore);

View file

@ -1,106 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2017 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.dev;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import net.minecraft.util.EnumFacing;
import reborncore.RebornCore;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core;
import java.io.*;
/**
* Created by Mark on 24/04/2016.
*/
//TODO DO NOT SHIP THIS!
public class JsonGenerator {
public void generate() throws IOException {
File mcDir = new File(".");
File exportFolder = new File(mcDir, "export");
if (!exportFolder.exists()) {
exportFolder.mkdir();
}
File assetsFolder = new File(exportFolder, "assets");
if (!assetsFolder.exists()) {
assetsFolder.mkdir();
}
File modFolder = new File(assetsFolder, "techreborn");
if (!modFolder.exists()) {
modFolder.mkdir();
}
File blockstates = new File(modFolder, "blockstates");
if (!blockstates.exists()) {
blockstates.mkdir();
}
File models = new File(modFolder, "models");
if (!models.exists()) {
models.mkdir();
}
File blockModels = new File(models, "block");
if (!blockModels.exists()) {
blockModels.mkdir();
}
File itemModles = new File(models, "item");
if (!itemModles.exists()) {
itemModles.mkdir();
}
File baseJsonFiles = new File(mcDir, "basejsons");
if (!baseJsonFiles.exists()) {
Core.logHelper.error("Could not find base jsons dir!");
throw new FileNotFoundException();
}
File machineBaseFile = new File(baseJsonFiles, "machineBase.json");
String machineBase = Files.toString(machineBaseFile, Charsets.UTF_8);
for (Object object : RebornCore.jsonDestroyer.objectsToDestroy) {
if (object instanceof BlockMachineBase) {
BlockMachineBase base = (BlockMachineBase) object;
String name = base.getRegistryName().getResourcePath().replace("tile.techreborn.", "");
File state = new File(blockstates, name + ".json");
if (state.exists()) {
state.delete();
}
String output = machineBase;
output = output.replaceAll("%OFF_TEXTURE%", base.getTextureNameFromState(base.getDefaultState(), EnumFacing.NORTH));
output = output.replaceAll("%ON_TEXTURE%", base.getTextureNameFromState(base.getDefaultState().withProperty(BlockMachineBase.ACTIVE, true), EnumFacing.NORTH));
output = output.replaceAll("%SIDE_TEXTURE%", base.getTextureNameFromState(base.getDefaultState(), EnumFacing.EAST));
output = output.replaceAll("%TOP_TEXTURE%", base.getTextureNameFromState(base.getDefaultState(), EnumFacing.UP));
try {
FileOutputStream is = new FileOutputStream(state);
OutputStreamWriter osw = new OutputStreamWriter(is);
Writer w = new BufferedWriter(osw);
w.write(output);
w.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
}

View file

@ -47,6 +47,7 @@ import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer; import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.itemblocks.*; import techreborn.itemblocks.*;
import techreborn.lib.ModInfo;
import techreborn.tiles.*; import techreborn.tiles.*;
import techreborn.tiles.cable.TileCable; import techreborn.tiles.cable.TileCable;
import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.fusionReactor.TileEntityFusionController;
@ -141,114 +142,80 @@ public class ModBlocks {
public static void init() { public static void init() {
THERMAL_GENERATOR = new BlockThermalGenerator(); THERMAL_GENERATOR = new BlockThermalGenerator();
registerBlock(THERMAL_GENERATOR, "techreborn.thermalGenerator"); registerBlock(THERMAL_GENERATOR, "thermal_generator");
GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGeneratorTR"); GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(THERMAL_GENERATOR, "machines/generators/thermal_generator");
QUANTUM_TANK = new BlockQuantumTank(); QUANTUM_TANK = new BlockQuantumTank();
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "techreborn.quantumTank"); registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
GameRegistry.registerTileEntity(TileQuantumTank.class, "TileQuantumTankTR"); GameRegistry.registerTileEntity(TileQuantumTank.class, "TileQuantumTankTR");
Core.proxy.registerCustomBlockStateLocation(QUANTUM_TANK, "machines/tier3_machines/quantum_tank");
QUANTUM_CHEST = new BlockQuantumChest(); QUANTUM_CHEST = new BlockQuantumChest();
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "techreborn.quantumChest"); registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
GameRegistry.registerTileEntity(TileQuantumChest.class, "TileQuantumChestTR"); GameRegistry.registerTileEntity(TileQuantumChest.class, "TileQuantumChestTR");
Core.proxy.registerCustomBlockStateLocation(QUANTUM_CHEST, "machines/tier3_machines/quantum_chest");
DIGITAL_CHEST = new BlockDigitalChest(); DIGITAL_CHEST = new BlockDigitalChest();
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "techreborn.digitalChest"); registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
GameRegistry.registerTileEntity(TileDigitalChest.class, "TileDigitalChestTR"); GameRegistry.registerTileEntity(TileDigitalChest.class, "TileDigitalChestTR");
Core.proxy.registerCustomBlockStateLocation(DIGITAL_CHEST, "machines/tier2_machines/digital_chest");
INDUSTRIAL_CENTRIFUGE = new BlockCentrifuge(); INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge();
registerBlock(INDUSTRIAL_CENTRIFUGE, "techreborn.centrifuge"); registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge");
GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR"); GameRegistry.registerTileEntity(TileIndustrialCentrifuge.class, "TileIndustrialCentrifugeTR");
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_CENTRIFUGE, "machines/tier2_machines/industrial_centrifuge");
ROLLING_MACHINE = new BlockRollingMachine(Material.ROCK); ROLLING_MACHINE = new BlockRollingMachine();
registerBlock(ROLLING_MACHINE, "rollingmachine"); registerBlock(ROLLING_MACHINE, "rolling_machine");
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR"); GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
Core.proxy.registerCustomBlockStateLocation(ROLLING_MACHINE, "machines/tier1_machines/rolling_machine");
INDUSTRIAL_BLAST_FURNACE = new BlockBlastFurnace(Material.ROCK); INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace();
registerBlock(INDUSTRIAL_BLAST_FURNACE, "blastFurnace"); registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace");
GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR"); GameRegistry.registerTileEntity(TileIndustrialBlastFurnace.class, "TileIndustrialBlastFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_BLAST_FURNACE, "machines/tier2_machines/industrial_blast_furnace");
ALLOY_SMELTER = new BlockAlloySmelter(Material.ROCK); ALLOY_SMELTER = new BlockAlloySmelter();
registerBlock(ALLOY_SMELTER, "alloySmelter"); registerBlock(ALLOY_SMELTER, "alloy_smelter");
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR"); GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
Core.proxy.registerCustomBlockStateLocation(ALLOY_SMELTER, "machines/tier1_machines/electric_alloy_smelter");
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder(Material.ROCK); INDUSTRIAL_GRINDER = new BlockIndustrialGrinder();
registerBlock(INDUSTRIAL_GRINDER, "grinder"); registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder");
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR"); GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_GRINDER, "machines/tier2_machines/industrial_grinder");
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor(Material.ROCK); IMPLOSION_COMPRESSOR = new BlockImplosionCompressor();
registerBlock(IMPLOSION_COMPRESSOR, "implosioncompressor"); registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor");
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR"); GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
Core.proxy.registerCustomBlockStateLocation(IMPLOSION_COMPRESSOR, "machines/tier2_machines/implosion_compressor");
MATTER_FABRICATOR = new BlockMatterFabricator(Material.ROCK); MATTER_FABRICATOR = new BlockMatterFabricator();
registerBlock(MATTER_FABRICATOR, "matterfabricator"); registerBlock(MATTER_FABRICATOR, "matter_fabricator");
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR"); GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
Core.proxy.registerCustomBlockStateLocation(MATTER_FABRICATOR, "machines/tier3_machines/matter_fabricator");
CHUNK_LOADER = new BlockChunkLoader(Material.ROCK); CHUNK_LOADER = new BlockChunkLoader();
registerBlock(CHUNK_LOADER, "chunkloader"); registerBlock(CHUNK_LOADER, "chunk_loader");
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR"); GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
Core.proxy.registerCustomBlockStateLocation(CHUNK_LOADER, "machines/tier3_machines/industrial_chunk_loader");
CHARGE_O_MAT = new BlockChargeBench(Material.ROCK); CHARGE_O_MAT = new BlockChargeOMat();
registerBlock(CHARGE_O_MAT, "chargebench"); registerBlock(CHARGE_O_MAT, "charge_o_mat");
GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench"); GameRegistry.registerTileEntity(TileChargeOMat.class, "TileChargeOMatTR");
Core.proxy.registerCustomBlockStateLocation(CHARGE_O_MAT, "machines/tier2_machines/charge_bench");
PLAYER_DETECTOR = new BlockPlayerDetector(); PLAYER_DETECTOR = new BlockPlayerDetector();
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "playerDetector"); registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR"); GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
CABLE = new BlockCable(); CABLE = new BlockCable();
registerBlock(CABLE, ItemBlockCable.class, "cable"); registerBlock(CABLE, ItemBlockCable.class, "cable");
GameRegistry.registerTileEntity(TileCable.class, "TileCableTR"); GameRegistry.registerTileEntity(TileCable.class, "TileCableTR");
Core.proxy.registerCustomBlockStateLocation(CABLE, "cable");
// for (EnumCableType cableType : EnumCableType.values()) {
// Core.proxy.registerSubBlockInventoryLocation(CABLE, cableType.ordinal(), "techreborn:cable", "type=inv_" + cableType.getName().toLowerCase());
// }
MACHINE_CASINGS = new BlockMachineCasing(Material.ROCK); MACHINE_CASINGS = new BlockMachineCasing();
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machinecasing"); registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing");
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR"); GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
if (Core.proxy.isCTMAvailable()) {
Core.proxy.registerCustomBlockStateLocation(MACHINE_CASINGS, "machines/structure/machine_casing_ctm");
} else {
Core.proxy.registerCustomBlockStateLocation(MACHINE_CASINGS, "machines/structure/machine_casing");
}
ORE = new BlockOre(Material.ROCK); ORE = new BlockOre();
registerBlock(ORE, ItemBlockOre.class, "techreborn.ore"); registerBlock(ORE, ItemBlockOre.class, "ore");
for (int i = 0; i < BlockOre.ores.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(ORE, i, "storage/ores", BlockOre.ores[i]);
}
ORE2 = new BlockOre2(Material.ROCK); ORE2 = new BlockOre2();
registerBlock(ORE2, ItemBlockOre2.class, "techreborn.ore2"); registerBlock(ORE2, ItemBlockOre2.class, "ore2");
for (int i = 0; i < BlockOre2.ores.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(ORE2, i, "storage/ores", BlockOre2.ores[i]);
}
STORAGE = new BlockStorage(Material.IRON); STORAGE = new BlockStorage();
registerBlock(STORAGE, ItemBlockStorage.class, "techreborn.storage"); registerBlock(STORAGE, ItemBlockStorage.class, "storage");
for (int i = 0; i < BlockStorage.types.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(STORAGE, i, "storage/storage", BlockStorage.types[i]);
}
STORAGE2 = new BlockStorage2(Material.IRON); STORAGE2 = new BlockStorage2();
registerBlock(STORAGE2, ItemBlockStorage2.class, "techreborn.storage2"); registerBlock(STORAGE2, ItemBlockStorage2.class, "storage2");
for (int i = 0; i < BlockStorage2.types.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(STORAGE2, i, "storage/storage", BlockStorage2.types[i]);
}
DRAGON_EGG_SIPHONER = new BlockDragonEggSiphoner(Material.ROCK); DRAGON_EGG_SIPHONER = new BlockDragonEggSiphoner(Material.ROCK);
registerBlock(DRAGON_EGG_SIPHONER, "dragoneggenergsiphon"); registerBlock(DRAGON_EGG_SIPHONER, "dragoneggenergsiphon");
@ -478,18 +445,20 @@ public class ModBlocks {
public static void registerBlock(Block block, String name) { public static void registerBlock(Block block, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setRegistryName(name); block.setRegistryName(ModInfo.MOD_ID, name);
block.setUnlocalizedName(ModInfo.MOD_ID + ":" + name);
GameRegistry.register(block); GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block), block.getRegistryName()); GameRegistry.register(new ItemBlock(block), block.getRegistryName());
} }
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) { public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setRegistryName(name); block.setRegistryName(ModInfo.MOD_ID, name);
block.setUnlocalizedName(ModInfo.MOD_ID + ":" + name);
GameRegistry.register(block); GameRegistry.register(block);
try { try {
ItemBlock itemBlock = itemclass.getConstructor(Block.class).newInstance(block); ItemBlock itemBlock = itemclass.getConstructor(Block.class).newInstance(block);
itemBlock.setRegistryName(name); itemBlock.setRegistryName(ModInfo.MOD_ID, name);
GameRegistry.register(itemBlock); GameRegistry.register(itemBlock);
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
e.printStackTrace(); e.printStackTrace();

View file

@ -24,24 +24,21 @@
package techreborn.items; package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
public class ItemDestructopack extends ItemTextureBase implements ITexturedItem { public class ItemDestructopack extends ItemTR {
public ItemDestructopack() { public ItemDestructopack() {
this.setUnlocalizedName("techreborn.destructopack"); this.setUnlocalizedName("techreborn.destructopack");
this.setCreativeTab(TechRebornCreativeTabMisc.instance); this.setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
@ -51,14 +48,4 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem
(int) player.posY); (int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
} }
@Override
public int getMaxMeta() {
return 1;
}
@Override
public String getTextureName(final int arg0) {
return "techreborn:items/misc/destructopack";
}
} }

View file

@ -34,7 +34,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemDusts extends ItemTRNoDestroy { public class ItemDusts extends ItemTR {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena", "dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",

View file

@ -33,7 +33,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemDustsSmall extends ItemTRNoDestroy { public class ItemDustsSmall extends ItemTR {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",

View file

@ -48,7 +48,7 @@ import techreborn.lib.MessageIDs;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
public class ItemFrequencyTransmitter extends ItemTRNoDestroy { public class ItemFrequencyTransmitter extends ItemTR {
public ItemFrequencyTransmitter() { public ItemFrequencyTransmitter() {
setUnlocalizedName("techreborn.frequencyTransmitter"); setUnlocalizedName("techreborn.frequencyTransmitter");

View file

@ -33,7 +33,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemGems extends ItemTRNoDestroy { public class ItemGems extends ItemTR {
public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" }; public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" };

View file

@ -34,7 +34,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemIngots extends ItemTRNoDestroy { public class ItemIngots extends ItemTR {
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", "invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "advanced_alloy", "mixed_metal", "hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "advanced_alloy", "mixed_metal",

View file

@ -24,22 +24,11 @@
package techreborn.items; package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
public class ItemMissingRecipe extends ItemTextureBase implements ITexturedItem { public class ItemMissingRecipe extends ItemTR {
public ItemMissingRecipe() { public ItemMissingRecipe() {
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.missingrecipe"); setUnlocalizedName("techreborn.missingrecipe");
} }
@Override
public String getTextureName(int damage) {
return "techreborn:items/misc/missing_recipe";
}
@Override
public int getMaxMeta() {
return 1;
}
} }

View file

@ -33,7 +33,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemNuggets extends ItemTRNoDestroy { public class ItemNuggets extends ItemTR {
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", "invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",

View file

@ -37,7 +37,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemParts extends ItemTRNoDestroy { public class ItemParts extends ItemTR {
public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit", public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit",
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple", "data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six", "helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",

View file

@ -34,7 +34,7 @@ import techreborn.init.ModItems;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemPlates extends ItemTRNoDestroy { public class ItemPlates extends ItemTR {
//Vanilla plates or plates not from ingots or gems //Vanilla plates or plates not from ingots or gems
public static String[] types = new String[] { public static String[] types = new String[] {

View file

@ -31,16 +31,14 @@ import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import techreborn.api.ScrapboxList; import techreborn.api.ScrapboxList;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
public class ItemScrapBox extends ItemTRNoDestroy { public class ItemScrapBox extends ItemTR {
public ItemScrapBox() { public ItemScrapBox() {
setUnlocalizedName("techreborn.scrapbox"); setUnlocalizedName("techreborn.scrapbox");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override

View file

@ -33,7 +33,6 @@ public class ItemTR extends Item {
public ItemTR() { public ItemTR() {
setNoRepair(); setNoRepair();
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
RebornCore.jsonDestroyer.registerObject(this);
} }
} }

View file

@ -1,37 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2017 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.items;
import net.minecraft.item.Item;
import techreborn.client.TechRebornCreativeTab;
public class ItemTRNoDestroy extends Item {
public ItemTRNoDestroy() {
setNoRepair();
setCreativeTab(TechRebornCreativeTab.instance);
}
}

View file

@ -1,39 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2017 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import techreborn.lib.ModInfo;
public abstract class ItemTextureBase extends ItemTR implements ITexturedItem {
@Override
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5).toLowerCase(), "inventory");
}
}

View file

@ -26,7 +26,7 @@ package techreborn.items;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
public class ItemUUmatter extends ItemTRNoDestroy { public class ItemUUmatter extends ItemTR {
public ItemUUmatter() { public ItemUUmatter() {
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);

View file

@ -58,7 +58,7 @@ import javax.annotation.Nullable;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade { public class ItemUpgrades extends ItemTR implements IUpgrade {
public static final String[] types = new String[] { "overclock", "transformer", "energy_storage", "range", "ejection", "injection" }; public static final String[] types = new String[] { "overclock", "transformer", "energy_storage", "range", "ejection", "injection" };

View file

@ -33,11 +33,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { public class ItemBattery extends ItemTR implements IEnergyItemInfo {
String name; String name;
int maxEnergy = 0; int maxEnergy = 0;

View file

@ -40,11 +40,11 @@ import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemInfo { public class ItemCloakingDevice extends ItemTR implements IEnergyItemInfo {
@ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in EU)") @ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in EU)")
public static int usage = 10; public static int usage = 10;

View file

@ -36,12 +36,12 @@ import net.minecraft.world.World;
import reborncore.api.power.IEnergyInterfaceTile; import reborncore.api.power.IEnergyInterfaceTile;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
/** /**
* Created by Mark on 20/03/2016. * Created by Mark on 20/03/2016.
*/ */
public class ItemDebugTool extends ItemTRNoDestroy { public class ItemDebugTool extends ItemTR {
public ItemDebugTool() { public ItemDebugTool() {
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);

View file

@ -43,12 +43,12 @@ import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.compat.CompatManager; import techreborn.compat.CompatManager;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
/** /**
* Created by modmuss50 on 05/11/2016. * Created by modmuss50 on 05/11/2016.
*/ */
public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemInfo { public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
public static final int maxCharge = 5120; public static final int maxCharge = 5120;
public static final int tier = 1; public static final int tier = 1;

View file

@ -36,11 +36,11 @@ import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
import java.util.List; import java.util.List;
public class ItemTechManual extends ItemTRNoDestroy { public class ItemTechManual extends ItemTR {
public ItemTechManual() { public ItemTechManual() {
this.setCreativeTab(TechRebornCreativeTab.instance); this.setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -36,9 +36,9 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.compat.CompatManager; import techreborn.compat.CompatManager;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
public class ItemTreeTap extends ItemTRNoDestroy { public class ItemTreeTap extends ItemTR {
public ItemTreeTap() { public ItemTreeTap() {
setMaxStackSize(1); setMaxStackSize(1);

View file

@ -53,7 +53,7 @@ import techreborn.blocks.storage.BlockEnergyStorage;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.compat.CompatManager; import techreborn.compat.CompatManager;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTR;
import techreborn.utils.IC2WrenchHelper; import techreborn.utils.IC2WrenchHelper;
import java.util.ArrayList; import java.util.ArrayList;
@ -63,7 +63,7 @@ import java.util.Random;
/** /**
* Created by modmuss50 on 26/02/2016. * Created by modmuss50 on 26/02/2016.
*/ */
public class ItemWrench extends ItemTRNoDestroy { public class ItemWrench extends ItemTR {
public ItemWrench() { public ItemWrench() {
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);

View file

@ -45,11 +45,10 @@ import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import reborncore.RebornCore; import prospector.shootingstar.ShootingStar;
import reborncore.api.tile.IUpgradeable; import reborncore.api.tile.IUpgradeable;
import reborncore.client.hud.StackInfoHUD; import reborncore.client.hud.StackInfoHUD;
import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockMachineFrame;
@ -97,12 +96,13 @@ public class ClientProxy extends CommonProxy {
@Override @Override
public void preInit(FMLPreInitializationEvent event) { public void preInit(FMLPreInitializationEvent event) {
super.preInit(event); super.preInit(event);
ShootingStar.registerModels(ModInfo.MOD_ID);
StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter()); StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter());
RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke()); RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke());
ManualLoader loader = new ManualLoader(new File(event.getModConfigurationDirectory(), "techreborn")); ManualLoader loader = new ManualLoader(new File(event.getModConfigurationDirectory(), "techreborn"));
// new Thread(() -> // new Thread(() ->`
// { // {
// try { // try {
// loader.load(); // loader.load();
@ -111,12 +111,12 @@ public class ClientProxy extends CommonProxy {
// } // }
// }).start(); // }).start();
for (Object object : RebornCore.jsonDestroyer.objectsToDestroy) { // for (Object object : RebornCore.jsonDestroyer.objectsToDestroy) {
if (object instanceof BlockMachineBase) { // if (object instanceof BlockMachineBase) {
BlockMachineBase base = (BlockMachineBase) object; // BlockMachineBase base = (BlockMachineBase) object;
registerItemModel(Item.getItemFromBlock(base)); // registerItemModel(Item.getItemFromBlock(base));
} // }
} // }
for (int i = 0; i < BlockMachineCasing.types.length; i++) { for (int i = 0; i < BlockMachineCasing.types.length; i++) {
Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_CASINGS, i, "techreborn:machines/structure/machine_casing", "type=" + i); Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_CASINGS, i, "techreborn:machines/structure/machine_casing", "type=" + i);
@ -223,14 +223,6 @@ public class ClientProxy extends CommonProxy {
return isChiselAround; return isChiselAround;
} }
public class RenderManagerNuke implements IRenderFactory<EntityNukePrimed> {
@Override
public Render<? super EntityNukePrimed> createRenderFor(RenderManager manager) {
return new RenderNukePrimed(manager);
}
}
@Override @Override
public String getUpgradeConfigText() { public String getUpgradeConfigText() {
if (Minecraft.getMinecraft().currentScreen instanceof GuiBase) { if (Minecraft.getMinecraft().currentScreen instanceof GuiBase) {
@ -243,4 +235,12 @@ public class ClientProxy extends CommonProxy {
} }
return super.getUpgradeConfigText(); return super.getUpgradeConfigText();
} }
public class RenderManagerNuke implements IRenderFactory<EntityNukePrimed> {
@Override
public Render<? super EntityNukePrimed> createRenderFor(RenderManager manager) {
return new RenderNukePrimed(manager);
}
}
} }

View file

@ -42,7 +42,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class TileChargeBench extends TilePowerAcceptor public class TileChargeOMat extends TilePowerAcceptor
implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider { implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider {
@ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchMaxInput", comment = "Charge Bench Max Input (Value in EU)") @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchMaxInput", comment = "Charge Bench Max Input (Value in EU)")
@ -52,9 +52,9 @@ public class TileChargeBench extends TilePowerAcceptor
// @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchWrenchDropRate", comment = "Charge Bench Wrench Drop Rate") // @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchWrenchDropRate", comment = "Charge Bench Wrench Drop Rate")
public static float wrenchDropRate = 1.0F; public static float wrenchDropRate = 1.0F;
public Inventory inventory = new Inventory(6, "TileChargeBench", 64, this); public Inventory inventory = new Inventory(6, "TileChargeOMat", 64, this);
public TileChargeBench() { public TileChargeOMat() {
super(); super();
} }

View file

@ -50,7 +50,7 @@ import techreborn.lib.ModInfo;
import java.util.List; import java.util.List;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class TileCentrifuge extends TilePowerAcceptor public class TileIndustrialCentrifuge extends TilePowerAcceptor
implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider { implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "centrifuge", key = "CentrifugeMaxInput", comment = "Centrifuge Max Input (Value in EU)") @ConfigRegistry(config = "machines", category = "centrifuge", key = "CentrifugeMaxInput", comment = "Centrifuge Max Input (Value in EU)")
@ -61,10 +61,10 @@ public class TileCentrifuge extends TilePowerAcceptor
public static float wrenchDropRate = 1.0F; public static float wrenchDropRate = 1.0F;
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this); public Inventory inventory = new Inventory(11, "TileIndustrialCentrifuge", 64, this);
public RecipeCrafter crafter; public RecipeCrafter crafter;
public TileCentrifuge() { public TileIndustrialCentrifuge() {
super(); super();
// Input slots // Input slots
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };

View file

@ -51,18 +51,18 @@ import techreborn.init.ModBlocks;
import techreborn.multiblocks.MultiBlockCasing; import techreborn.multiblocks.MultiBlockCasing;
import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMachineCasing;
public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider,
ITileRecipeHandler<BlastFurnaceRecipe>, IRecipeCrafterProvider, IContainerProvider { ITileRecipeHandler<BlastFurnaceRecipe>, IRecipeCrafterProvider, IContainerProvider {
public static int euTick = 5; public static int euTick = 5;
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(4, "TileBlastFurnace", 64, this); public Inventory inventory = new Inventory(4, "TileIndustrialBlastFurnace", 64, this);
public RecipeCrafter crafter; public RecipeCrafter crafter;
public int capacity = 1000; public int capacity = 1000;
private int cachedHeat; private int cachedHeat;
public TileBlastFurnace() { public TileIndustrialBlastFurnace() {
super(); super();
// TODO configs // TODO configs
final int[] inputs = new int[2]; final int[] inputs = new int[2];
@ -219,8 +219,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
@Override @Override
public boolean canCraft(final TileEntity tile, final BlastFurnaceRecipe recipe) { public boolean canCraft(final TileEntity tile, final BlastFurnaceRecipe recipe) {
if (tile instanceof TileBlastFurnace) { if (tile instanceof TileIndustrialBlastFurnace) {
final TileBlastFurnace blastFurnace = (TileBlastFurnace) tile; final TileIndustrialBlastFurnace blastFurnace = (TileIndustrialBlastFurnace) tile;
return blastFurnace.getHeat() >= recipe.neededHeat; return blastFurnace.getHeat() >= recipe.neededHeat;
} }
return false; return false;

View file

@ -0,0 +1,26 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"particle": "#cable"
}
},
"variants": {
"type": {
"all": {
"textures": {
}
},
"others": {
"textures": {
}
},
"you": {
"textures": {
}
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Before After
Before After

View file

@ -1,5 +1,5 @@
{ {
"animation":{ "animation":{
"frametime":2 "frametime":4
} }
} }