Revert "Revert a shit load of stuff"

This reverts commit d25bb23e8e.
This commit is contained in:
modmuss50 2016-07-01 15:55:37 +01:00
parent d25bb23e8e
commit 315c0aa509
327 changed files with 1686 additions and 2476 deletions

View file

@ -10,7 +10,7 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileDigitalChest;
public class BlockDigitalChest extends BlockMachineBase
public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRotationTexture
{
private final String prefix = "techreborn:blocks/machine/greg_machines/";
@ -37,4 +37,28 @@ public class BlockDigitalChest extends BlockMachineBase
return true;
}
@Override
public String getFront(boolean isActive)
{
return prefix + "quantum_chest";
}
@Override
public String getSide(boolean isActive)
{
return prefix + "qchest_side";
}
@Override
public String getTop(boolean isActive)
{
return prefix + "quantum_top";
}
@Override
public String getBottom(boolean isActive)
{
return prefix + "machine_bottom";
}
}

View file

@ -14,7 +14,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.util.ItemNBTHelper;
import reborncore.shields.RebornCoreShields;
import techreborn.client.TechRebornCreativeTab;
/**

View file

@ -34,7 +34,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class BlockOre extends BaseBlock implements IOreNameProvider
public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvider
{
public static final String[] ores = new String[] { "galena", "iridium", "ruby", "sapphire", "bauxite", "pyrite",
@ -198,17 +198,17 @@ public class BlockOre extends BaseBlock implements IOreNameProvider
// return meta;
// }
// @Override
// public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
// {
// return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]);
// }
//
// @Override
// public int amountOfStates()
// {
// return ores.length;
// }
@Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
{
return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]);
}
@Override
public int amountOfStates()
{
return ores.length;
}
@Override
public int damageDropped(IBlockState state) {

View file

@ -27,7 +27,7 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import techreborn.world.config.IOreNameProvider;
public class BlockOre2 extends BaseBlock implements IOreNameProvider
public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProvider
{
public static final String[] ores = new String[] { "copper", "tin"};
@ -119,17 +119,17 @@ public class BlockOre2 extends BaseBlock implements IOreNameProvider
// return meta;
// }
// @Override
// public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
// {
// return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]);
// }
//
// @Override
// public int amountOfStates()
// {
// return ores.length;
// }
@Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
{
return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]);
}
@Override
public int amountOfStates()
{
return ores.length;
}
@Override
public int damageDropped(IBlockState state) {

View file

@ -15,7 +15,7 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileQuantumChest;
public class BlockQuantumChest extends BlockMachineBase
public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRotationTexture
{
private final String prefix = "techreborn:blocks/machine/greg_machines/";
@ -42,4 +42,28 @@ public class BlockQuantumChest extends BlockMachineBase
playerIn.openGui(Core.INSTANCE, GuiHandler.quantumChestID, worldIn, pos.getX(), pos.getY(), pos.getZ());
return true;
}
@Override
public String getFront(boolean isActive)
{
return prefix + "quantum_chest";
}
@Override
public String getSide(boolean isActive)
{
return prefix + "qchest_side";
}
@Override
public String getTop(boolean isActive)
{
return prefix + "quantum_top";
}
@Override
public String getBottom(boolean isActive)
{
return prefix + "machine_bottom";
}
}

View file

@ -11,7 +11,7 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileQuantumTank;
public class BlockQuantumTank extends BlockMachineBase
public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture
{
private final String prefix = "techreborn:blocks/machine/greg_machines/";
@ -44,4 +44,28 @@ public class BlockQuantumTank extends BlockMachineBase
}
return true;
}
@Override
public String getFront(boolean isActive)
{
return "techreborn:blocks/machine/generators/thermal_generator_side_off";
}
@Override
public String getSide(boolean isActive)
{
return "techreborn:blocks/machine/generators/thermal_generator_side_off";
}
@Override
public String getTop(boolean isActive)
{
return prefix + "quantum_top";
}
@Override
public String getBottom(boolean isActive)
{
return "techreborn:blocks/machine/generators/thermal_generator_bottom";
}
}

View file

@ -1,6 +1,5 @@
package techreborn.blocks;
import com.google.common.collect.Lists;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -13,21 +12,18 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import java.util.List;
import java.util.Random;
public class BlockStorage extends BaseBlock
public class BlockStorage extends BaseBlock implements ITexturedBlock
{
public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass",
"lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" };
static List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public PropertyString VARIANTS = new PropertyString("type", oreNamesList);
public PropertyInteger METADATA;
public BlockStorage(Material material)
{
@ -35,7 +31,7 @@ public class BlockStorage extends BaseBlock
setUnlocalizedName("techreborn.storage");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f);
this.setDefaultState(this.getStateFromMeta(0));
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
}
public static ItemStack getStorageBlockByName(String name, int count)
@ -78,22 +74,37 @@ public class BlockStorage extends BaseBlock
}
@Override
public IBlockState getStateFromMeta(int meta) {
if(meta > types.length){
meta = 0;
}
return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta));
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
{
return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block";
}
@Override
public int getMetaFromState(IBlockState state) {
return oreNamesList.indexOf(state.getValue(VARIANTS));
public int amountOfStates()
{
return types.length;
}
@Override
public IBlockState getStateFromMeta(int meta)
{
if(meta > types.length){
meta = 0;
}
return this.getDefaultState().withProperty(METADATA, meta);
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(METADATA);
}
protected BlockStateContainer createBlockState()
{
VARIANTS = new PropertyString("type", oreNamesList);
return new BlockStateContainer(this, VARIANTS);
METADATA = PropertyInteger.create("type", 0, types.length - 1);
return new BlockStateContainer(this, METADATA);
}
}

View file

@ -1,6 +1,5 @@
package techreborn.blocks;
import com.google.common.collect.Lists;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -13,8 +12,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
@ -22,14 +19,13 @@ import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random;
public class BlockStorage2 extends BaseBlock
public class BlockStorage2 extends BaseBlock implements ITexturedBlock
{
public static final String[] types = new String[] { "tungstensteel",
"iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot",
"yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" };
static List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public PropertyString VARIANTS = new PropertyString("type", oreNamesList);
public PropertyInteger METADATA;
public BlockStorage2(Material material)
{
@ -37,7 +33,7 @@ public class BlockStorage2 extends BaseBlock
setUnlocalizedName("techreborn.storage2");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f);
this.setDefaultState(this.getStateFromMeta(0));
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
}
public static ItemStack getStorageBlockByName(String name, int count)
@ -75,22 +71,37 @@ public class BlockStorage2 extends BaseBlock
}
@Override
public IBlockState getStateFromMeta(int meta) {
if(meta > types.length){
meta = 0;
}
return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta));
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing)
{
return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block";
}
@Override
public int getMetaFromState(IBlockState state) {
return oreNamesList.indexOf(state.getValue(VARIANTS));
public int amountOfStates()
{
return types.length;
}
@Override
public IBlockState getStateFromMeta(int meta)
{
if(meta > types.length){
meta = 0;
}
return this.getDefaultState().withProperty(METADATA, meta);
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(METADATA);
}
protected BlockStateContainer createBlockState()
{
VARIANTS = new PropertyString("type", oreNamesList);
return new BlockStateContainer(this, VARIANTS);
METADATA = PropertyInteger.create("type", 0, types.length - 1);
return new BlockStateContainer(this, METADATA);
}
}

View file

@ -0,0 +1,53 @@
package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileHeatGenerator;
public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockHeatGenerator(Material material)
{
super();
setUnlocalizedName("techreborn.heatgenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
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";
}
}