Cleanup
This commit is contained in:
parent
1639fd63a3
commit
d0dedc6893
76 changed files with 44 additions and 743 deletions
|
@ -48,12 +48,9 @@ import net.minecraft.util.shape.VoxelShape;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.TileAlarm;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
@ -68,7 +65,6 @@ public class BlockAlarm extends BaseTileBlock {
|
|||
super(Block.Settings.of(Material.STONE));
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false));
|
||||
this.shape = GenCuboidShapes(3, 10);
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));
|
||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.advanced.TileDieselGenerator;
|
||||
|
||||
|
@ -39,11 +36,6 @@ import techreborn.tiles.generator.advanced.TileDieselGenerator;
|
|||
*/
|
||||
public class BlockDieselGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockDieselGenerator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileDieselGenerator();
|
||||
|
|
|
@ -27,19 +27,11 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.generator.advanced.TileDragonEggSyphon;
|
||||
|
||||
public class BlockDragonEggSyphon extends BlockMachineBase {
|
||||
|
||||
public BlockDragonEggSyphon() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileDragonEggSyphon();
|
||||
|
|
|
@ -44,9 +44,6 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.init.ModSounds;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
@ -56,7 +53,6 @@ public class BlockFusionCoil extends Block {
|
|||
|
||||
public BlockFusionCoil() {
|
||||
super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL).build());
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,11 +34,8 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import reborncore.common.util.Torus;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||
|
@ -48,11 +45,6 @@ import java.util.List;
|
|||
|
||||
public class BlockFusionControlComputer extends BlockMachineBase {
|
||||
|
||||
public BlockFusionControlComputer() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn,
|
||||
Hand hand, BlockHitResult hitResult) {
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.advanced.TileGasTurbine;
|
||||
|
||||
public class BlockGasTurbine extends BlockMachineBase {
|
||||
|
||||
public BlockGasTurbine() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileGasTurbine();
|
||||
|
|
|
@ -27,19 +27,11 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.generator.TileLightningRod;
|
||||
|
||||
public class BlockLightningRod extends BlockMachineBase {
|
||||
|
||||
public BlockLightningRod() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileLightningRod();
|
||||
|
|
|
@ -31,21 +31,12 @@ import net.minecraft.client.item.TooltipContext;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockMagicEnergyAbsorber extends BlockMachineBase {
|
||||
|
||||
public BlockMagicEnergyAbsorber() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
|
||||
tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED));
|
||||
|
|
|
@ -31,20 +31,11 @@ import net.minecraft.text.Text;
|
|||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockMagicEnergyConverter extends BlockMachineBase {
|
||||
|
||||
public BlockMagicEnergyConverter() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.TilePlasmaGenerator;
|
||||
|
||||
|
@ -38,11 +35,6 @@ import techreborn.tiles.generator.TilePlasmaGenerator;
|
|||
* Block for Plasma Generator
|
||||
*/
|
||||
public class BlockPlasmaGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockPlasmaGenerator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
|
||||
|
||||
public class BlockSemiFluidGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockSemiFluidGenerator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileSemiFluidGenerator();
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.init.TRContent.SolarPanels;
|
||||
import techreborn.tiles.generator.TileSolarPanel;
|
||||
|
||||
|
@ -44,7 +41,6 @@ public class BlockSolarPanel extends BlockMachineBase {
|
|||
public BlockSolarPanel(SolarPanels panel) {
|
||||
super();
|
||||
this.panelType = panel;
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
|
||||
|
||||
|
@ -38,7 +35,6 @@ public class BlockSolidFuelGenerator extends BlockMachineBase {
|
|||
|
||||
public BlockSolidFuelGenerator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.generator.advanced.TileThermalGenerator;
|
||||
|
||||
public class BlockThermalGenerator extends BlockMachineBase {
|
||||
|
||||
public BlockThermalGenerator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileThermalGenerator();
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.generator.basic.TileWaterMill;
|
||||
|
||||
/**
|
||||
|
@ -38,11 +35,6 @@ import techreborn.tiles.generator.basic.TileWaterMill;
|
|||
*/
|
||||
public class BlockWaterMill extends BlockMachineBase {
|
||||
|
||||
public BlockWaterMill() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileWaterMill();
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.generator;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.generator.basic.TileWindMill;
|
||||
|
||||
/**
|
||||
|
@ -38,11 +35,6 @@ import techreborn.tiles.generator.basic.TileWindMill;
|
|||
*/
|
||||
public class BlockWindMill extends BlockMachineBase {
|
||||
|
||||
public BlockWindMill() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileWindMill();
|
||||
|
|
|
@ -44,12 +44,9 @@ import net.minecraft.util.shape.VoxelShape;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.lighting.TileLamp;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
@ -69,7 +66,6 @@ public class BlockLamp extends BaseTileBlock {
|
|||
this.shape = GenCuboidShapes(depth, width);
|
||||
this.cost = cost;
|
||||
this.brightness = brightness;
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));
|
||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -36,20 +36,12 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.init.ModSounds;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
public class BlockComputerCube extends BlockMachineBase {
|
||||
|
||||
public BlockComputerCube() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMachineGuiHandler getGui() {
|
||||
return null;
|
||||
|
|
|
@ -39,10 +39,7 @@ import net.minecraft.state.property.BooleanProperty;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.explosion.Explosion;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseBlock;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.entities.EntityNukePrimed;
|
||||
|
||||
/**
|
||||
|
@ -54,7 +51,6 @@ public class BlockNuke extends BaseBlock {
|
|||
public BlockNuke() {
|
||||
super(Block.Settings.of(Material.TNT));
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(OVERLAY, false));
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
|
||||
public void ignite(World worldIn, BlockPos pos, BlockState state, LivingEntity igniter) {
|
||||
|
|
|
@ -28,15 +28,11 @@ import net.fabricmc.fabric.api.block.FabricBlockSettings;
|
|||
import net.minecraft.block.GlassBlock;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
public class BlockReinforcedGlass extends GlassBlock {
|
||||
|
||||
public BlockReinforcedGlass() {
|
||||
super(FabricBlockSettings.of(Material.GLASS).strength(4f, 60f).sounds(BlockSoundGroup.STONE).build());
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -30,16 +30,12 @@ import net.minecraft.block.FireBlock;
|
|||
import net.minecraft.block.LeavesBlock;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
public class BlockRubberLeaves extends LeavesBlock {
|
||||
|
||||
public BlockRubberLeaves() {
|
||||
super(FabricBlockSettings.of(Material.LEAVES).hardness(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).build());
|
||||
((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 30, 60);
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, DISTANCE, PERSISTENT));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -42,12 +42,9 @@ import net.minecraft.util.hit.BlockHitResult;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.powerSystem.ExternalPowerSystems;
|
||||
import reborncore.common.powerSystem.ItemPowerManager;
|
||||
import reborncore.common.util.WorldUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.events.TRRecipeHandler;
|
||||
import techreborn.init.ModSounds;
|
||||
import techreborn.init.TRContent;
|
||||
|
@ -68,7 +65,6 @@ public class BlockRubberLog extends LogBlock {
|
|||
super(MaterialColor.SPRUCE, FabricBlockSettings.of(Material.WOOD, MaterialColor.BROWN).strength(2.0F, 2f).sounds(BlockSoundGroup.WOOD).ticksRandomly().build());
|
||||
this.setDefaultState(this.getDefaultState().with(SAP_SIDE, Direction.NORTH).with(HAS_SAP, false).with(AXIS, Direction.Axis.Y));
|
||||
((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 5);
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -30,9 +30,6 @@ import net.minecraft.block.Blocks;
|
|||
import net.minecraft.block.FireBlock;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 20/02/2016.
|
||||
|
@ -42,6 +39,5 @@ public class BlockRubberPlank extends Block {
|
|||
public BlockRubberPlank() {
|
||||
super(FabricBlockSettings.of(Material.WOOD).strength(2f, 2f).sounds(BlockSoundGroup.WOOD).build());
|
||||
((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 20);
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,14 +29,10 @@ import net.minecraft.block.Material;
|
|||
import net.minecraft.block.MaterialColor;
|
||||
import net.minecraft.block.SlabBlock;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
public class BlockRubberPlankSlab extends SlabBlock {
|
||||
|
||||
public BlockRubberPlankSlab() {
|
||||
super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build());
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,15 +26,11 @@ package techreborn.blocks.misc;
|
|||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.StairsBlock;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
public class BlockRubberPlankStair extends StairsBlock {
|
||||
|
||||
public BlockRubberPlankStair() {
|
||||
super(TRContent.RUBBER_PLANKS.getDefaultState(), Block.Settings.copy(TRContent.RUBBER_PLANKS));
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||
}
|
||||
}
|
|
@ -42,12 +42,9 @@ import net.minecraft.util.math.Direction;
|
|||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
/**
|
||||
* Created by Rushmead
|
||||
|
@ -62,7 +59,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
|
|||
this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH));
|
||||
this.name = name;
|
||||
this.gui = gui;
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -38,13 +38,10 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.tiles.storage.lesu.TileLSUStorage;
|
||||
|
||||
|
@ -55,7 +52,6 @@ public class BlockLSUStorage extends BaseTileBlock {
|
|||
|
||||
public BlockLSUStorage() {
|
||||
super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).build());
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -32,20 +32,12 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
|
||||
|
||||
public class BlockIronAlloyFurnace extends BlockMachineBase {
|
||||
|
||||
public BlockIronAlloyFurnace() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIronAlloyFurnace();
|
||||
|
|
|
@ -38,10 +38,7 @@ import net.minecraft.util.math.Direction;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.iron.TileIronFurnace;
|
||||
|
||||
|
@ -49,11 +46,6 @@ import java.util.Random;
|
|||
|
||||
public class BlockIronFurnace extends BlockMachineBase {
|
||||
|
||||
public BlockIronFurnace() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
@Environment(EnvType.CLIENT)
|
||||
public void randomDisplayTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) {
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileAlloySmelter;
|
||||
|
||||
|
@ -38,7 +35,6 @@ public class BlockAlloySmelter extends BlockMachineBase {
|
|||
|
||||
public BlockAlloySmelter() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,10 +27,7 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileAssemblingMachine;
|
||||
|
||||
|
@ -38,7 +35,6 @@ public class BlockAssemblingMachine extends BlockMachineBase {
|
|||
|
||||
public BlockAssemblingMachine() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
|
||||
|
||||
public class BlockAutoCraftingTable extends BlockMachineBase {
|
||||
|
||||
public BlockAutoCraftingTable() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileAutoCraftingTable();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileCompressor;
|
||||
|
||||
public class BlockCompressor extends BlockMachineBase {
|
||||
|
||||
public BlockCompressor() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileCompressor();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileElectricFurnace;
|
||||
|
||||
public class BlockElectricFurnace extends BlockMachineBase {
|
||||
|
||||
public BlockElectricFurnace() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileElectricFurnace();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileExtractor;
|
||||
|
||||
public class BlockExtractor extends BlockMachineBase {
|
||||
|
||||
public BlockExtractor() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileExtractor();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileGrinder;
|
||||
|
||||
public class BlockGrinder extends BlockMachineBase {
|
||||
|
||||
public BlockGrinder() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileGrinder();
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
package techreborn.blocks.tier1;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.block.Block;
|
||||
|
@ -37,7 +36,9 @@ import net.minecraft.entity.LivingEntity;
|
|||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.StateFactory;
|
||||
import net.minecraft.state.property.EnumProperty;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.StringIdentifiable;
|
||||
import net.minecraft.util.hit.BlockHitResult;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
|
@ -46,31 +47,19 @@ import net.minecraft.world.World;
|
|||
import reborncore.api.IToolDrop;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import reborncore.common.blocks.PropertyString;
|
||||
import reborncore.common.util.ArrayUtils;
|
||||
import reborncore.common.util.ChatUtils;
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.tiles.machine.tier1.TilePlayerDectector;
|
||||
import techreborn.utils.MessageIDs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockPlayerDetector extends BlockMachineBase {
|
||||
|
||||
public static final String[] types = new String[] { "all", "others", "you" };
|
||||
static List<String> typeNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
|
||||
public static PropertyString TYPE;
|
||||
public static EnumProperty<PlayerDetectorType> TYPE;
|
||||
|
||||
public BlockPlayerDetector() {
|
||||
super(Block.Settings.of(Material.METAL), true);
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(TYPE, types[0]));
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
|
||||
}
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(TYPE, PlayerDetectorType.ALL));
|
||||
}
|
||||
|
||||
// BlockMachineBase
|
||||
|
@ -98,8 +87,8 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
return super.activate(state, worldIn, pos, playerIn, hand, hitResult);
|
||||
}
|
||||
|
||||
String type = state.get(TYPE);
|
||||
String newType = type;
|
||||
PlayerDetectorType type = state.get(TYPE);
|
||||
PlayerDetectorType newType = type;
|
||||
Formatting color = Formatting.GREEN;
|
||||
|
||||
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
|
||||
|
@ -119,14 +108,14 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
return true;
|
||||
}
|
||||
} else {
|
||||
if (type.equals("all")) {
|
||||
newType = "others";
|
||||
if (type == PlayerDetectorType.ALL) {
|
||||
newType = PlayerDetectorType.OTHERS;
|
||||
color = Formatting.RED;
|
||||
} else if (type.equals("others")) {
|
||||
newType = "you";
|
||||
} else if (type == PlayerDetectorType.OTHERS) {
|
||||
newType = PlayerDetectorType.YOU;
|
||||
color = Formatting.BLUE;
|
||||
} else if (type.equals("you")) {
|
||||
newType = "all";
|
||||
} else if (type == PlayerDetectorType.YOU) {
|
||||
newType = PlayerDetectorType.ALL;
|
||||
}
|
||||
worldIn.setBlockState(pos, state.with(TYPE, newType));
|
||||
}
|
||||
|
@ -136,7 +125,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
if (worldIn.isClient) {
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.playerDetectorID, new LiteralText(
|
||||
Formatting.GRAY + I18n.translate("techreborn.message.detects") + " " + color
|
||||
+ StringUtils.toFirstCapital(newType)));
|
||||
+ StringUtils.toFirstCapital(newType.asString())));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
@ -149,7 +138,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
// Block
|
||||
@Override
|
||||
protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
|
||||
TYPE = new PropertyString("type", types);
|
||||
TYPE = EnumProperty.of("type", PlayerDetectorType.class);
|
||||
builder.add(TYPE);
|
||||
}
|
||||
|
||||
|
@ -175,4 +164,24 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public enum PlayerDetectorType implements StringIdentifiable {
|
||||
ALL("all"), OTHERS("others"), YOU("you");
|
||||
|
||||
private final String name;
|
||||
|
||||
private PlayerDetectorType(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String asString() {
|
||||
return this.name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileRecycler;
|
||||
|
||||
public class BlockRecycler extends BlockMachineBase {
|
||||
|
||||
public BlockRecycler() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileRecycler();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileRollingMachine;
|
||||
|
||||
public class BlockRollingMachine extends BlockMachineBase {
|
||||
|
||||
public BlockRollingMachine() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileRollingMachine();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier1;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileScrapboxinator;
|
||||
|
||||
public class BlockScrapboxinator extends BlockMachineBase {
|
||||
|
||||
public BlockScrapboxinator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileScrapboxinator();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.TileChargeOMat;
|
||||
|
||||
public class BlockChargeOMat extends BlockMachineBase {
|
||||
|
||||
public BlockChargeOMat() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileChargeOMat();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileChemicalReactor;
|
||||
|
||||
public class BlockChemicalReactor extends BlockMachineBase {
|
||||
|
||||
public BlockChemicalReactor() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileChemicalReactor();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.TileDigitalChest;
|
||||
|
||||
public class BlockDigitalChest extends BlockMachineBase {
|
||||
|
||||
public BlockDigitalChest() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileDigitalChest();
|
||||
|
|
|
@ -27,19 +27,11 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileDistillationTower;
|
||||
|
||||
public class BlockDistillationTower extends BlockMachineBase {
|
||||
|
||||
public BlockDistillationTower() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
|
||||
|
||||
public class BlockImplosionCompressor extends BlockMachineBase {
|
||||
|
||||
public BlockImplosionCompressor() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileImplosionCompressor();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
|
||||
|
||||
public class BlockIndustrialBlastFurnace extends BlockMachineBase {
|
||||
|
||||
public BlockIndustrialBlastFurnace() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIndustrialBlastFurnace();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.TileIndustrialCentrifuge;
|
||||
|
||||
public class BlockIndustrialCentrifuge extends BlockMachineBase {
|
||||
|
||||
public BlockIndustrialCentrifuge() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIndustrialCentrifuge();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
|
||||
|
||||
public class BlockIndustrialElectrolyzer extends BlockMachineBase {
|
||||
|
||||
public BlockIndustrialElectrolyzer() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIndustrialElectrolyzer();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
|
||||
|
||||
public class BlockIndustrialGrinder extends BlockMachineBase {
|
||||
|
||||
public BlockIndustrialGrinder() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIndustrialGrinder();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
|
||||
|
||||
public class BlockIndustrialSawmill extends BlockMachineBase {
|
||||
|
||||
public BlockIndustrialSawmill() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileIndustrialSawmill();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier2;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
|
||||
|
||||
public class BlockVacuumFreezer extends BlockMachineBase {
|
||||
|
||||
public BlockVacuumFreezer() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileVacuumFreezer();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileChunkLoader;
|
||||
|
||||
public class BlockChunkLoader extends BlockMachineBase {
|
||||
|
||||
public BlockChunkLoader() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileChunkLoader();
|
||||
|
|
|
@ -30,20 +30,12 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileCreativeQuantumChest;
|
||||
|
||||
public class BlockCreativeQuantumChest extends BlockMachineBase {
|
||||
|
||||
public BlockCreativeQuantumChest() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileCreativeQuantumChest();
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileCreativeQuantumTank;
|
||||
|
||||
public class BlockCreativeQuantumTank extends BlockMachineBase {
|
||||
|
||||
public BlockCreativeQuantumTank() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileCreativeQuantumTank();
|
||||
|
|
|
@ -27,19 +27,11 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
|
||||
|
||||
public class BlockFluidReplicator extends BlockMachineBase {
|
||||
|
||||
public BlockFluidReplicator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileMatterFabricator;
|
||||
|
||||
public class BlockMatterFabricator extends BlockMachineBase {
|
||||
|
||||
public BlockMatterFabricator() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileMatterFabricator();
|
||||
|
|
|
@ -27,19 +27,11 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileQuantumChest;
|
||||
|
||||
public class BlockQuantumChest extends BlockMachineBase {
|
||||
|
||||
public BlockQuantumChest() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
|
|
|
@ -27,20 +27,12 @@ package techreborn.blocks.tier3;
|
|||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.api.tile.IMachineGuiHandler;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.tiles.machine.tier3.TileQuantumTank;
|
||||
|
||||
public class BlockQuantumTank extends BlockMachineBase {
|
||||
|
||||
public BlockQuantumTank() {
|
||||
super();
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileQuantumTank();
|
||||
|
|
|
@ -41,12 +41,9 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
/**
|
||||
* Created by Rushmead
|
||||
|
@ -60,7 +57,6 @@ public abstract class BlockTransformer extends BaseTileBlock {
|
|||
super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).build());
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH));
|
||||
this.name = name;
|
||||
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue