Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)
This commit is contained in:
parent
1fa9f1cf52
commit
40e3062903
123 changed files with 1469 additions and 1486 deletions
|
@ -27,25 +27,28 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.generator.TileCreativePanel;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileCreativeSolarPanel;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 25/02/2016.
|
||||
*/
|
||||
public class BlockCreativePanel extends BaseTileBlock {
|
||||
public class BlockCreativeSolarPanel extends BaseTileBlock {
|
||||
|
||||
public BlockCreativePanel() {
|
||||
public BlockCreativeSolarPanel() {
|
||||
super(Material.IRON);
|
||||
setUnlocalizedName("techreborn.creativepanel");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setHardness(2.0F);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World worldIn, int meta) {
|
||||
return new TileCreativePanel();
|
||||
return new TileCreativeSolarPanel();
|
||||
}
|
||||
|
||||
}
|
|
@ -24,23 +24,25 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileDieselGenerator;
|
||||
|
||||
public class BlockDieselGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockDieselGenerator(final Material material) {
|
||||
public BlockDieselGenerator() {
|
||||
super();
|
||||
this.setUnlocalizedName("techreborn.dieselgenerator");
|
||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,29 +24,31 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.generator.TileDragonEggSiphoner;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileDragonEggSyphon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockDragonEggSiphoner extends BlockMachineBase {
|
||||
public class BlockDragonEggSyphon extends BlockMachineBase {
|
||||
|
||||
public BlockDragonEggSiphoner(Material material) {
|
||||
public BlockDragonEggSyphon() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.dragoneggsiphoner");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
|
||||
return new TileDragonEggSiphoner();
|
||||
return new TileDragonEggSyphon();
|
||||
}
|
||||
|
||||
@Override
|
|
@ -29,18 +29,21 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileGasTurbine;
|
||||
|
||||
public class BlockGasTurbine extends BlockMachineBase {
|
||||
|
||||
public BlockGasTurbine(final Material material) {
|
||||
public BlockGasTurbine() {
|
||||
super();
|
||||
this.setUnlocalizedName("techreborn.gasTurbine");
|
||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,24 +24,21 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileHeatGenerator;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockHeatGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockHeatGenerator(Material material) {
|
||||
public BlockHeatGenerator() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.heatgenerator");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,19 +24,21 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileLightningRod;
|
||||
|
||||
public class BlockLightningRod extends BlockMachineBase {
|
||||
|
||||
public BlockLightningRod(Material material) {
|
||||
public BlockLightningRod() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.lightningrod");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,16 +24,18 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
public class BlockMagicEnergyAbsorber extends BlockMachineBase {
|
||||
|
||||
public BlockMagicEnergyAbsorber(Material material) {
|
||||
public BlockMagicEnergyAbsorber() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.magicenergyabsorber");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -24,15 +24,17 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
public class BlockMagicEnergyConverter extends BlockMachineBase {
|
||||
|
||||
public BlockMagicEnergyConverter(Material material) {
|
||||
public BlockMagicEnergyConverter() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.magicenergyconverter");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,28 +24,30 @@
|
|||
|
||||
package techreborn.blocks.generator;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.generator.TileSemifluidGenerator;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileSemiFluidGenerator;
|
||||
|
||||
public class BlockSemiFluidGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockSemiFluidGenerator(final Material material) {
|
||||
public BlockSemiFluidGenerator() {
|
||||
super();
|
||||
this.setUnlocalizedName("techreborn.semifluidgenerator");
|
||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
|
||||
return new TileSemifluidGenerator();
|
||||
return new TileSemiFluidGenerator();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,8 +34,11 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileSolarPanel;
|
||||
|
||||
/**
|
||||
|
@ -44,14 +47,13 @@ import techreborn.tiles.generator.TileSolarPanel;
|
|||
public class BlockSolarPanel extends BaseTileBlock {
|
||||
|
||||
public static PropertyBool ACTIVE = PropertyBool.create("active");
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
||||
public BlockSolarPanel() {
|
||||
super(Material.IRON);
|
||||
setUnlocalizedName("techreborn.solarpanel");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false));
|
||||
setHardness(2.0F);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
protected BlockStateContainer createBlockState() {
|
||||
|
|
|
@ -27,23 +27,26 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.generator.TileGenerator;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileSolidFuelGenerator;
|
||||
|
||||
public class BlockGenerator extends BlockMachineBase {
|
||||
public class BlockSolidFuelGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockGenerator() {
|
||||
public BlockSolidFuelGenerator() {
|
||||
super();
|
||||
this.setUnlocalizedName("techreborn.generator");
|
||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
|
||||
return new TileGenerator();
|
||||
return new TileSolidFuelGenerator();
|
||||
}
|
||||
|
||||
@Override
|
|
@ -27,9 +27,11 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.RebornCore;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileWaterMill;
|
||||
|
||||
/**
|
||||
|
@ -37,13 +39,11 @@ import techreborn.tiles.generator.TileWaterMill;
|
|||
*/
|
||||
public class BlockWaterMill extends BaseTileBlock {
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
||||
public BlockWaterMill() {
|
||||
super(Material.IRON);
|
||||
setUnlocalizedName("techreborn.watermill");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setHardness(2.0F);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -26,8 +26,11 @@ package techreborn.blocks.generator;
|
|||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.generator.TileWindMill;
|
||||
|
||||
/**
|
||||
|
@ -37,9 +40,9 @@ public class BlockWindMill extends BlockMachineBase {
|
|||
|
||||
public BlockWindMill() {
|
||||
super(false);
|
||||
setUnlocalizedName("techreborn.windmill");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setHardness(2.0F);
|
||||
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue