This commit is contained in:
drcrazy 2019-07-22 02:43:22 +03:00
parent 1639fd63a3
commit d0dedc6893
76 changed files with 44 additions and 743 deletions

View file

@ -32,6 +32,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import reborncore.common.registration.RegistrationManager;
import reborncore.common.util.Torus;
import techreborn.client.GuiHandler;
import techreborn.events.ModRegistry;
@ -59,7 +61,8 @@ public class TechReborn implements ModInitializer {
@Override
public void onInitialize() {
INSTANCE = this;
// RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass());
@SuppressWarnings("unused")
RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass());
// TechRebornAPI.subItemRetriever = new SubItemRetriever();
// Done like this to load them here
ModFluids.values();

View file

@ -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);
}

View file

@ -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();

View file

@ -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();

View file

@ -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

View file

@ -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) {

View file

@ -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();

View file

@ -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();

View file

@ -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));

View file

@ -31,21 +31,12 @@ 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) {
tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED));

View file

@ -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;
@ -39,11 +36,6 @@ import techreborn.tiles.generator.TilePlasmaGenerator;
*/
public class BlockPlasmaGenerator extends BlockMachineBase {
public BlockPlasmaGenerator() {
super();
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
}
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TilePlasmaGenerator();

View file

@ -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();

View file

@ -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

View file

@ -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

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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);
}

View file

@ -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;

View file

@ -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) {

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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();

View file

@ -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) {

View file

@ -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

View file

@ -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

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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;
}
}
}

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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.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) {
return new TileDistillationTower();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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();

View file

@ -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.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) {
return new TileFluidReplicator();

View file

@ -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();

View file

@ -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.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) {
return new TileQuantumChest();

View file

@ -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();

View file

@ -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);
}

View file

@ -28,7 +28,6 @@ import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.client.gui.builder.widget.GuiButtonUpDown;
import reborncore.common.network.NetworkManager;
import reborncore.common.powerSystem.PowerSystem;

View file

@ -24,9 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.GuiLighting;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Recipe;
@ -37,8 +35,6 @@ import reborncore.common.network.NetworkManager;
import techreborn.packets.ServerboundPackets;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import static net.minecraft.item.ItemStack.EMPTY;
/**
* Created by modmuss50 on 20/06/2017.
*/

View file

@ -1,270 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 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.events;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
import techreborn.init.TRContent.*;
import java.util.Arrays;
/**
* @author drcrazy
*
*/
@Environment(EnvType.CLIENT)
public class ModelRegistryEventHandler {
public static void registerModels() {
registerBlocks();
registerFluidBlocks();
registerItems();
//RebornModelRegistry.registerModels(TechReborn.MOD_ID);
}
private static void registerBlocks() {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, TRContent.REFINED_IRON_FENCE));
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, TRContent.RUBBER_SAPLING));
for (Ores value : Ores.values()) {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.block).setFileName("ore").setInvVariant("type=" + value.name));
}
for (StorageBlocks value : StorageBlocks.values()) {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.block).setFileName("storage_block").setInvVariant("type=" + value.name));
}
for (MachineBlocks value : MachineBlocks.values()) {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.frame).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_frame"));
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.casing).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_casing"));
}
/*
ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv");
for (Cables value : Cables.values()) {
registerBlockstateMultiItem(cableRL, Item.getItemFromBlock(value.block), value.name);
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
Map<IProperty<?>, Comparable<?>> map = Maps.newLinkedHashMap(state.getProperties());
String property = this.getPropertyString(map) + ",ztype=" + value.name;
return new ModelResourceLocation(new ResourceLocation(TechReborn.MOD_ID,
"cable_" + (value.cableThickness == 5 ? "thick" : "thin")), property);
}
});
}
*/
}
private static void registerFluidBlocks() {
/*
registerFluidBlockModel(ModFluids.BLOCK_BERYLLIUM);
registerFluidBlockModel(ModFluids.BLOCK_CALCIUM);
registerFluidBlockModel(ModFluids.BLOCK_CALCIUM_CARBONATE);
registerFluidBlockModel(ModFluids.BLOCK_CHLORITE);
registerFluidBlockModel(ModFluids.BLOCK_DEUTERIUM);
registerFluidBlockModel(ModFluids.BLOCK_GLYCERYL);
registerFluidBlockModel(ModFluids.BLOCK_HELIUM);
registerFluidBlockModel(ModFluids.BLOCK_HELIUM_3);
registerFluidBlockModel(ModFluids.BLOCK_HELIUMPLASMA);
registerFluidBlockModel(ModFluids.BLOCK_HYDROGEN);
registerFluidBlockModel(ModFluids.BLOCK_LITHIUM);
registerFluidBlockModel(ModFluids.BLOCK_MERCURY);
registerFluidBlockModel(ModFluids.BLOCK_METHANE);
registerFluidBlockModel(ModFluids.BLOCK_NITROCOAL_FUEL);
registerFluidBlockModel(ModFluids.BLOCK_NITROFUEL);
registerFluidBlockModel(ModFluids.BLOCK_NITROGEN);
registerFluidBlockModel(ModFluids.BLOCK_NITROGENDIOXIDE);
registerFluidBlockModel(ModFluids.BLOCK_POTASSIUM);
registerFluidBlockModel(ModFluids.BLOCK_SILICON);
registerFluidBlockModel(ModFluids.BLOCK_SODIUM);
registerFluidBlockModel(ModFluids.BLOCK_SODIUMPERSULFATE);
registerFluidBlockModel(ModFluids.BLOCK_TRITIUM);
registerFluidBlockModel(ModFluids.BLOCK_WOLFRAMIUM);
registerFluidBlockModel(ModFluids.BLOCK_CARBON);
registerFluidBlockModel(ModFluids.BLOCK_CARBON_FIBER);
registerFluidBlockModel(ModFluids.BLOCK_NITRO_CARBON);
registerFluidBlockModel(ModFluids.BLOCK_SULFUR);
registerFluidBlockModel(ModFluids.BLOCK_SODIUM_SULFIDE);
registerFluidBlockModel(ModFluids.BLOCK_DIESEL);
registerFluidBlockModel(ModFluids.BLOCK_NITRO_DIESEL);
registerFluidBlockModel(ModFluids.BLOCK_OIL);
registerFluidBlockModel(ModFluids.BLOCK_SULFURIC_ACID);
registerFluidBlockModel(ModFluids.BLOCK_COMPRESSED_AIR);
registerFluidBlockModel(ModFluids.BLOCK_ELECTROLYZED_WATER);
*/
}
private static void registerItems() {
// Armor
register(TRContent.CLOAKING_DEVICE, "armor/cloaking_device");
register(TRContent.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack");
register(TRContent.LITHIUM_ION_BATPACK, "armor/lithium_batpack");
// Battery
register(TRContent.RED_CELL_BATTERY, "battery/re_battery");
register(TRContent.LITHIUM_ION_BATTERY, "battery/lithium_battery");
register(TRContent.ENERGY_CRYSTAL, "battery/energy_crystal");
register(TRContent.LAPOTRON_CRYSTAL, "battery/lapotron_crystal");
register(TRContent.LAPOTRONIC_ORB, "battery/lapotronic_orb");
// Tools
register(TRContent.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw");
register(TRContent.INDUSTRIAL_DRILL, "tool/industrial_drill");
register(TRContent.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer");
register(TRContent.DEBUG_TOOL, "tool/debug");
register(TRContent.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
register(TRContent.ADVANCED_DRILL, "tool/advanced_drill");
register(TRContent.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
register(TRContent.ELECTRIC_TREE_TAP, "tool/electric_treetap");
register(TRContent.NANOSABER, "tool/nanosaber");
register(TRContent.OMNI_TOOL, "tool/omni_tool");
register(TRContent.ROCK_CUTTER, "tool/rock_cutter");
register(TRContent.BASIC_CHAINSAW, "tool/basic_chainsaw");
register(TRContent.BASIC_DRILL, "tool/basic_drill");
register(TRContent.BASIC_JACKHAMMER, "tool/basic_jackhammer");
register(TRContent.TREE_TAP, "tool/treetap");
register(TRContent.WRENCH, "tool/wrench");
// Other
register(TRContent.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter");
register(TRContent.SCRAP_BOX, "misc/scrapbox");
register(TRContent.MANUAL, "misc/manual");
// Gem armor & tools
if (ConfigTechReborn.enableGemArmorAndTools) {
Identifier armourRL = new Identifier(TechReborn.MOD_ID, "items/armour");
registerBlockstateMultiItem(armourRL, TRContent.RUBY_HELMET, "ruby_helmet");
registerBlockstateMultiItem(armourRL, TRContent.RUBY_CHESTPLATE, "ruby_chestplate");
registerBlockstateMultiItem(armourRL, TRContent.RUBY_LEGGINGS, "ruby_leggings");
registerBlockstateMultiItem(armourRL, TRContent.RUBY_BOOTS, "ruby_boots");
registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_HELMET, "sapphire_helmet");
registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_CHESTPLATE, "sapphire_chestplate");
registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_LEGGINGS, "sapphire_leggings");
registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_BOOTS, "sapphire_boots");
registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_HELMET, "peridot_helmet");
registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_CHESTPLATE, "peridot_chestplate");
registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_LEGGINGS, "peridot_leggings");
registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_BOOTS, "peridot_boots");
registerBlockstateMultiItem(armourRL, TRContent.BRONZE_HELMET, "bronze_helmet");
registerBlockstateMultiItem(armourRL, TRContent.BRONZE_CHESTPLATE, "bronze_chestplate");
registerBlockstateMultiItem(armourRL, TRContent.BRONZE_LEGGINGS, "bronze_leggings");
registerBlockstateMultiItem(armourRL, TRContent.BRONZE_BOOTS, "bronze_boots");
Identifier toolRL = new Identifier(TechReborn.MOD_ID, "items/tool");
registerBlockstateMultiItem(toolRL, TRContent.RUBY_PICKAXE, "ruby_pickaxe");
registerBlockstateMultiItem(toolRL, TRContent.RUBY_SWORD, "ruby_sword");
registerBlockstateMultiItem(toolRL, TRContent.RUBY_AXE, "ruby_axe");
registerBlockstateMultiItem(toolRL, TRContent.RUBY_SPADE, "ruby_spade");
registerBlockstateMultiItem(toolRL, TRContent.RUBY_HOE, "ruby_hoe");
registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_PICKAXE, "sapphire_pickaxe");
registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_SWORD, "sapphire_sword");
registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_AXE, "sapphire_axe");
registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_SPADE, "sapphire_spade");
registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_HOE, "sapphire_hoe");
registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_PICKAXE, "peridot_pickaxe");
registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_SWORD, "peridot_sword");
registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_AXE, "peridot_axe");
registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_SPADE, "peridot_spade");
registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_HOE, "peridot_hoe");
registerBlockstateMultiItem(toolRL, TRContent.BRONZE_PICKAXE, "bronze_pickaxe");
registerBlockstateMultiItem(toolRL, TRContent.BRONZE_SWORD, "bronze_sword");
registerBlockstateMultiItem(toolRL, TRContent.BRONZE_AXE, "bronze_axe");
registerBlockstateMultiItem(toolRL, TRContent.BRONZE_SPADE, "bronze_spade");
registerBlockstateMultiItem(toolRL, TRContent.BRONZE_HOE, "bronze_hoe");
}
Identifier dustsRL = new Identifier(TechReborn.MOD_ID, "items/material/dust");
Arrays.stream(Dusts.values()).forEach(value -> registerBlockstateMultiItem(dustsRL, value.item, value.name));
Identifier dustsSmallRL = new Identifier(TechReborn.MOD_ID, "items/material/small_dust");
Arrays.stream(SmallDusts.values()).forEach(value -> registerBlockstateMultiItem(dustsSmallRL, value.item, value.name));
Identifier gemsRL = new Identifier(TechReborn.MOD_ID, "items/material/gem");
Arrays.stream(Gems.values()).forEach(value -> registerBlockstateMultiItem(gemsRL, value.item, value.name));
Identifier ingotsRL = new Identifier(TechReborn.MOD_ID, "items/material/ingot");
Arrays.stream(Ingots.values()).forEach(value -> registerBlockstateMultiItem(ingotsRL, value.item, value.name));
Identifier nuggetsRL = new Identifier(TechReborn.MOD_ID, "items/material/nugget");
Arrays.stream(Nuggets.values()).forEach(value -> registerBlockstateMultiItem(nuggetsRL, value.item, value.name));
Identifier partsRL = new Identifier(TechReborn.MOD_ID, "items/material/part");
Arrays.stream(Parts.values()).forEach(value -> registerBlockstateMultiItem(partsRL, value.item, value.name));
Identifier platesRL = new Identifier(TechReborn.MOD_ID, "items/material/plate");
Arrays.stream(Plates.values()).forEach(value -> registerBlockstateMultiItem(platesRL, value.item, value.name));
Identifier upgradeRL = new Identifier(TechReborn.MOD_ID, "items/misc/upgrades");
Arrays.stream(Upgrades.values()).forEach(value -> registerBlockstateMultiItem(upgradeRL, value.item, value.name));
}
/*
private static void registerFluidBlockModel(BlockFluidTechReborn block) {
String name = block.getTranslationKey().substring(5).toLowerCase();
Item item = Item.getItemFromBlock(block);
ModelResourceLocation location = new ModelResourceLocation(
new ResourceLocation(TechReborn.MOD_ID, "fluids"), name);
ModelLoader.registerItemVariants(item);
ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return location;
}
});
ModelLoader.setCustomStateMapper(block, new StateMapperBase() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return location;
}
});
}
*/
private static void register(Item item, String modelPath) {
//RebornModelRegistry.registerItemModel(item, modelPath);
}
private static void registerBlockstateMultiItem(Identifier RL, Item item, String variantName) {
//ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(RL, "type=" + variantName));
}
}

View file

@ -35,7 +35,6 @@ import techreborn.init.TRContent;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;

View file

@ -24,11 +24,7 @@
package techreborn.events;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import techreborn.init.TRContent;
public class TRTickHandler {

View file

@ -25,8 +25,6 @@
package techreborn.init;
import net.minecraft.util.Identifier;
import net.minecraft.world.loot.LootPool;
import net.minecraft.world.loot.LootTables;
import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn;

View file

@ -34,7 +34,6 @@ import net.minecraft.util.DefaultedList;
import net.minecraft.world.World;
import org.apache.commons.lang3.Validate;
import reborncore.fluid.Fluid;
import reborncore.fluid.FluidStack;
import techreborn.TechReborn;
import techreborn.init.TRContent;
import techreborn.utils.FluidUtils;

View file

@ -33,7 +33,6 @@ import net.minecraft.item.*;
import net.minecraft.util.DefaultedList;
import net.minecraft.world.World;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.ItemPowerManager;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.ItemDurabilityExtensions;

View file

@ -26,7 +26,6 @@ package techreborn.items.tool;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.Material;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.entity.LivingEntity;

View file

@ -31,7 +31,6 @@ import net.minecraft.block.Blocks;
import net.minecraft.block.Material;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemGroup;
@ -42,11 +41,8 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.util.*;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.RayTraceContext;
import net.minecraft.world.World;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.ItemPowerManager;
@ -58,7 +54,6 @@ import techreborn.items.tool.ItemDrill;
import techreborn.utils.MessageIDs;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

View file

@ -24,17 +24,12 @@
package techreborn.items.tool.industrial;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.attribute.EntityAttributeModifier;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.*;
import net.minecraft.nbt.CompoundTag;

View file

@ -119,11 +119,6 @@ public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop {
return panel.powerTier;
}
@Override
public EnumPowerTier getBaseTier() {
return getTier();
}
@Override
public void checkTier() {
// Nope

View file

@ -35,6 +35,7 @@ import reborncore.common.registration.config.ConfigRegistry;
import reborncore.common.util.WorldUtils;
import techreborn.TechReborn;
import techreborn.blocks.tier1.BlockPlayerDetector;
import techreborn.blocks.tier1.BlockPlayerDetector.PlayerDetectorType;
import techreborn.init.TRContent;
import techreborn.init.TRTileEntities;
@ -69,10 +70,10 @@ public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop
if (canUseEnergy(euPerTick)) {
for(PlayerEntity player : world.getPlayers()){
if (player.distanceTo(player) <= 256.0D) {
String type = world.getBlockState(pos).get(BlockPlayerDetector.TYPE);
if (type.equals("all")) {// ALL
PlayerDetectorType type = world.getBlockState(pos).get(BlockPlayerDetector.TYPE);
if (type == PlayerDetectorType.ALL) {// ALL
redstone = true;
} else if (type.equals("others")) {// Others
} else if (type == PlayerDetectorType.OTHERS) {// Others
if (!owenerUdid.isEmpty() && !owenerUdid.equals(player.getUuid().toString())) {
redstone = true;
}

View file

@ -110,7 +110,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
public ItemStack getDropWithNBT() {
CompoundTag tileEntity = new CompoundTag();
ItemStack dropStack = TRContent.Machine.ADJUSTABLE_SU.getStack();
writeWithoutCoords(tileEntity);
toTag(tileEntity);
dropStack.setTag(new CompoundTag());
dropStack.getTag().put("tileEntity", tileEntity);
return dropStack;
@ -149,11 +149,6 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
return maxInput;
}
@Override
public EnumPowerTier getBaseTier() {
return null;
}
// TilePowerAcceptor
@Override
public CompoundTag toTag(CompoundTag tagCompound) {

View file

@ -103,11 +103,6 @@ public class TileEnergyStorage extends TilePowerAcceptor
return maxInput;
}
@Override
public EnumPowerTier getBaseTier() {
return tier;
}
// TileMachineBase
@Override
public void setFacing(Direction enumFacing) {

View file

@ -113,11 +113,6 @@ public class TileTransformer extends TilePowerAcceptor
return inputTier.getMaxInput();
}
@Override
public EnumPowerTier getBaseTier() {
return inputTier;
}
@Override
public EnumPowerTier getPushingTier() {
return ouputTier;
@ -126,6 +121,7 @@ public class TileTransformer extends TilePowerAcceptor
@Override
public void checkTier() {
//Nope
//TODO: really nope? needs review
}
// TileMachineBase