Renamed ModBlocks to TRBlocks

This commit is contained in:
drcrazy 2018-09-23 23:21:19 +03:00
parent f02b24f813
commit bf7f7ba871
86 changed files with 307 additions and 298 deletions

View file

@ -39,7 +39,7 @@ import net.minecraft.world.World;
import reborncore.api.IToolDrop;
import reborncore.common.util.ChatUtils;
import techreborn.blocks.BlockAlarm;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import techreborn.utils.MessageIDs;
@ -106,6 +106,6 @@ public class TileAlarm extends TileEntity
// IToolDrop
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ALARM, 1);
return new ItemStack(TRBlocks.ALARM, 1);
}
}

View file

@ -40,7 +40,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileChargeOMat extends TilePowerAcceptor
@ -114,7 +114,7 @@ public class TileChargeOMat extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.CHARGE_O_MAT, 1);
return new ItemStack(TRBlocks.CHARGE_O_MAT, 1);
}
// ItemHandlerProvider

View file

@ -37,7 +37,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider {
@ -60,7 +60,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.CHUNK_LOADER, 1);
return new ItemStack(TRBlocks.CHUNK_LOADER, 1);
}
public boolean isComplete() {

View file

@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.items.DynamicCell;
import java.util.List;
@ -50,7 +50,7 @@ public class TileIndustrialCentrifuge extends TileGenericMachine implements ICon
public static int maxEnergy = 10_000;
public TileIndustrialCentrifuge() {
super("IndustrialCentrifuge", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_CENTRIFUGE, 6);
super("IndustrialCentrifuge", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_CENTRIFUGE, 6);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileIndustrialCentrifuge", 64, this).withConfiguredAccess();

View file

@ -38,7 +38,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
import techreborn.init.TRItems;
@ -198,7 +198,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.MATTER_FABRICATOR, 1);
return new ItemStack(TRBlocks.MATTER_FABRICATOR, 1);
}
// ItemHandlerProvider

View file

@ -42,7 +42,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import javax.annotation.Nullable;
import java.util.List;
@ -68,7 +68,7 @@ public class TileQuantumTank extends TileMachineBase
public ItemStack getDropWithNBT() {
final NBTTagCompound tileEntity = new NBTTagCompound();
final ItemStack dropStack = new ItemStack(ModBlocks.QUANTUM_TANK, 1);
final ItemStack dropStack = new ItemStack(TRBlocks.QUANTUM_TANK, 1);
this.writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -44,7 +44,7 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import java.util.List;
@ -105,7 +105,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
* @return boolean Returns true if block is fusion coil
*/
public boolean isCoil(BlockPos pos) {
return world.getBlockState(pos).getBlock() == ModBlocks.FUSION_COIL;
return world.getBlockState(pos).getBlock() == TRBlocks.FUSION_COIL;
}
/**
@ -359,7 +359,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.FUSION_CONTROL_COMPUTER, 1);
return new ItemStack(TRBlocks.FUSION_CONTROL_COMPUTER, 1);
}
// ItemHandlerProvider

View file

@ -37,7 +37,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
@ -145,6 +145,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.LIGHTNING_ROD);
return new ItemStack(TRBlocks.LIGHTNING_ROD);
}
}

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TilePlasmaGenerator extends TileBaseFluidGenerator implements IContainerProvider {
@ -53,7 +53,7 @@ public class TilePlasmaGenerator extends TileBaseFluidGenerator implements ICont
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.PLASMA_GENERATOR, 1);
return new ItemStack(TRBlocks.PLASMA_GENERATOR, 1);
}
@Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.DIESEL_GENERATOR, 1);
return new ItemStack(TRBlocks.DIESEL_GENERATOR, 1);
}
@Override

View file

@ -37,7 +37,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.Inventory;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileDragonEggSyphon extends TilePowerAcceptor
@ -116,7 +116,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1);
return new ItemStack(TRBlocks.DRAGON_EGG_SYPHON, 1);
}
// ItemHandlerProvider

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.GAS_TURBINE, 1);
return new ItemStack(TRBlocks.GAS_TURBINE, 1);
}
@Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1);
return new ItemStack(TRBlocks.SEMI_FLUID_GENERATOR, 1);
}
@Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.THERMAL_GENERATOR, 1);
return new ItemStack(TRBlocks.THERMAL_GENERATOR, 1);
}
@Override

View file

@ -42,7 +42,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider {
@ -147,7 +147,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR);
return new ItemStack(TRBlocks.SOLID_FUEL_GENEREATOR);
}
@Override

View file

@ -34,7 +34,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn;
import techreborn.blocks.generator.BlockWindMill;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 25/02/2016.
@ -107,6 +107,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IToolDrop {
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.WATER_MILL);
return new ItemStack(TRBlocks.WATER_MILL);
}
}

View file

@ -32,7 +32,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 25/02/2016.
@ -95,6 +95,6 @@ public class TileWindMill extends TilePowerAcceptor implements IToolDrop {
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.WIND_MILL);
return new ItemStack(TRBlocks.WIND_MILL);
}
}

View file

@ -46,7 +46,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileIronAlloyFurnace extends TileMachineBase
@ -297,7 +297,7 @@ public class TileIronAlloyFurnace extends TileMachineBase
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.IRON_ALLOY_FURNACE, 1);
return new ItemStack(TRBlocks.IRON_ALLOY_FURNACE, 1);
}
public boolean isComplete() {

View file

@ -28,7 +28,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
public class MultiblockChecker {
@ -50,16 +50,16 @@ public class MultiblockChecker {
// TODO: make thid not so ugly
public boolean checkCasing(int offX, int offY, int offZ, String type) {
Block block = getBlock(offX, offY, offZ).getBlock();
if (block == ModBlocks.MACHINE_CASINGS_STANDARD || block == ModBlocks.MACHINE_CASINGS_REINFORCED || block == ModBlocks.MACHINE_CASINGS_ADVANCED ) {
if (block == TRContent.MachineBlocks.BASIC.getCasing()|| block == TRContent.MachineBlocks.ADVANCED.getCasing() || block == TRContent.MachineBlocks.INDUSTRIAL.getCasing() ) {
if (type == MultiblockChecker.CASING_ANY) {
return true;
} else if ( type == "standard" && block == ModBlocks.MACHINE_CASINGS_STANDARD) {
} else if ( type == "standard" && block == TRContent.MachineBlocks.BASIC.getCasing()) {
return true;
}
else if (type == "reinforced" && block == ModBlocks.MACHINE_CASINGS_REINFORCED) {
else if (type == "reinforced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) {
return true;
}
else if (type == "advanced" && block == ModBlocks.MACHINE_CASINGS_ADVANCED) {
else if (type == "advanced" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) {
return true;
}
}

View file

@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -50,7 +50,7 @@ public class TileDistillationTower extends TileGenericMachine implements IContai
public MultiblockChecker multiblockChecker;
public TileDistillationTower() {
super("DistillationTower", maxInput, maxEnergy, ModBlocks.DISTILLATION_TOWER, 6);
super("DistillationTower", maxInput, maxEnergy, TRBlocks.DISTILLATION_TOWER, 6);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileDistillationTower", 64, this).withConfiguredAccess();

View file

@ -39,7 +39,7 @@ import techreborn.api.fluidreplicator.FluidReplicatorRecipeCrafter;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine;
@ -64,7 +64,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
int ticksSinceLastChange;
public TileFluidReplicator() {
super("FluidReplicator", maxInput, maxEnergy, ModBlocks.FLUID_REPLICATOR, 3);
super("FluidReplicator", maxInput, maxEnergy, TRBlocks.FLUID_REPLICATOR, 3);
final int[] inputs = new int[] { 0 };
this.inventory = new Inventory<>(4, "TileFluidReplicator", 64, this, getInventoryAccess());
this.crafter = new FluidReplicatorRecipeCrafter(this, this.inventory, inputs, null);

View file

@ -35,7 +35,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -49,7 +49,7 @@ public class TileImplosionCompressor extends TileGenericMachine implements ICont
public MultiblockChecker multiblockChecker;
public TileImplosionCompressor() {
super("ImplosionCompressor", maxInput, maxEnergy, ModBlocks.IMPLOSION_COMPRESSOR, 4);
super("ImplosionCompressor", maxInput, maxEnergy, TRBlocks.IMPLOSION_COMPRESSOR, 4);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3 };
this.inventory = new Inventory<>(5, "TileImplosionCompressor", 64, this);

View file

@ -44,7 +44,7 @@ import techreborn.blocks.BlockMachineCasing;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.multiblocks.MultiBlockCasing;
import techreborn.tiles.TileGenericMachine;
import techreborn.tiles.TileMachineCasing;
@ -61,7 +61,7 @@ public class TileIndustrialBlastFurnace extends TileGenericMachine implements IC
private int cachedHeat;
public TileIndustrialBlastFurnace() {
super("IndustrialBlastFurnace", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_BLAST_FURNACE, 4);
super("IndustrialBlastFurnace", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_BLAST_FURNACE, 4);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3 };
this.inventory = new Inventory<>(5, "TileIndustrialBlastFurnace", 64, this).withConfiguredAccess();

View file

@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable;
@ -67,7 +67,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
int ticksSinceLastChange;
public TileIndustrialGrinder() {
super("IndustrialGrinder", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_GRINDER, 7);
super("IndustrialGrinder", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_GRINDER, 7);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] {2, 3, 4, 5};
this.inventory = new Inventory<>(8, "TileIndustrialGrinder", 64, this, getInventoryAccess());

View file

@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable;
@ -66,7 +66,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
int ticksSinceLastChange;
public TileIndustrialSawmill() {
super("IndustrialSawmill", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_SAWMILL, 6);
super("IndustrialSawmill", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_SAWMILL, 6);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4 };
this.inventory = new Inventory<>(7, "TileSawmill", 64, this, getInventoryAccess());

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -48,7 +48,7 @@ public class TileVacuumFreezer extends TileGenericMachine implements IContainerP
public MultiblockChecker multiblockChecker;
public TileVacuumFreezer() {
super("VacuumFreezer", maxInput, maxEnergy, ModBlocks.VACUUM_FREEZER, 2);
super("VacuumFreezer", maxInput, maxEnergy, TRBlocks.VACUUM_FREEZER, 2);
final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileVacuumFreezer", 64, this).withConfiguredAccess();

View file

@ -37,7 +37,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -49,7 +49,7 @@ public class TileAlloySmelter extends TileGenericMachine implements IContainerPr
public static int maxEnergy = 1_000;
public TileAlloySmelter() {
super("AlloySmelter", maxInput, maxEnergy, ModBlocks.ALLOY_SMELTER, 3);
super("AlloySmelter", maxInput, maxEnergy, TRBlocks.ALLOY_SMELTER, 3);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileAlloySmelter", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileAssemblingMachine extends TileGenericMachine implements IContai
public static int maxEnergy = 10_000;
public TileAssemblingMachine() {
super("AssemblingMachine", maxInput, maxEnergy, ModBlocks.ASSEMBLY_MACHINE, 3);
super("AssemblingMachine", maxInput, maxEnergy, TRBlocks.ASSEMBLY_MACHINE, 3);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileAssemblingMachine", 64, this).withConfiguredAccess();

View file

@ -48,7 +48,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import javax.annotation.Nullable;
@ -425,7 +425,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.AUTO_CRAFTING_TABLE, 1);
return new ItemStack(TRBlocks.AUTO_CRAFTING_TABLE, 1);
}
// ItemHandlerProvider

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileChemicalReactor extends TileGenericMachine implements IContaine
public static int maxEnergy = 10_000;
public TileChemicalReactor() {
super("ChemicalReactor", maxInput, maxEnergy, ModBlocks.CHEMICAL_REACTOR, 3);
super("ChemicalReactor", maxInput, maxEnergy, TRBlocks.CHEMICAL_REACTOR, 3);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileChemicalReactor", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileCompressor extends TileGenericMachine implements IContainerProv
public static int maxEnergy = 1000;
public TileCompressor() {
super("Compressor", maxInput, maxEnergy, ModBlocks.COMPRESSOR, 2);
super("Compressor", maxInput, maxEnergy, TRBlocks.COMPRESSOR, 2);
final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileCompressor", 64, this).withConfiguredAccess();

View file

@ -40,7 +40,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileElectricFurnace extends TilePowerAcceptor
@ -204,7 +204,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ELECTRIC_FURNACE, 1);
return new ItemStack(TRBlocks.ELECTRIC_FURNACE, 1);
}
// ItemHandlerProvider

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileExtractor extends TileGenericMachine implements IContainerProvi
public static int maxEnergy = 1_000;
public TileExtractor() {
super("Extractor", maxInput, maxEnergy, ModBlocks.EXTRACTOR, 2);
super("Extractor", maxInput, maxEnergy, TRBlocks.EXTRACTOR, 2);
final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileExtractor", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileGrinder extends TileGenericMachine implements IContainerProvide
public static int maxEnergy = 1_000;
public TileGrinder() {
super("Grinder", maxInput, maxEnergy, ModBlocks.GRINDER, 2);
super("Grinder", maxInput, maxEnergy, TRBlocks.GRINDER, 2);
final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileGrinder", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.items.DynamicCell;
import techreborn.tiles.TileGenericMachine;
@ -48,7 +48,7 @@ public class TileIndustrialElectrolyzer extends TileGenericMachine implements IC
public static int maxEnergy = 10_000;
public TileIndustrialElectrolyzer() {
super("IndustrialElectrolyzer", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_ELECTROLYZER, 6);
super("IndustrialElectrolyzer", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_ELECTROLYZER, 6);
final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileIndustrialElectrolyzer", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.WorldUtils;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import java.util.Iterator;
@ -138,6 +138,6 @@ public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer p0) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, 0);
return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, 0);
}
}

View file

@ -39,7 +39,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -188,7 +188,7 @@ public class TileRecycler extends TilePowerAcceptor
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.RECYCLER, 1);
return new ItemStack(TRBlocks.RECYCLER, 1);
}
// ItemHandlerProvider

View file

@ -45,7 +45,7 @@ import techreborn.api.RollingMachineRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@ -274,7 +274,7 @@ public class TileRollingMachine extends TilePowerAcceptor
@Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ROLLING_MACHINE, 1);
return new ItemStack(TRBlocks.ROLLING_MACHINE, 1);
}
@Override

View file

@ -33,7 +33,7 @@ import techreborn.api.recipe.ScrapboxRecipeCrafter;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.TRItems;
import techreborn.tiles.TileGenericMachine;
@ -46,7 +46,7 @@ public class TileScrapboxinator extends TileGenericMachine implements IContainer
public static int maxEnergy = 1_000;
public TileScrapboxinator() {
super("Scrapboxinator", maxInput, maxEnergy, ModBlocks.SCRAPBOXINATOR, 2);
super("Scrapboxinator", maxInput, maxEnergy, TRBlocks.SCRAPBOXINATOR, 2);
final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileScrapboxinator", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
@RebornRegister(modID = TechReborn.MOD_ID)
public class TileAdjustableSU extends TileEnergyStorage implements IContainerProvider {
@ -51,7 +51,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
private int OUTPUT = 64; // The current output
public TileAdjustableSU() {
super("ADJUSTABLE_SU", 4, ModBlocks.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy);
super("ADJUSTABLE_SU", 4, TRBlocks.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy);
}
public void handleGuiInputFromClient(int id) {
@ -77,7 +77,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
public ItemStack getDropWithNBT() {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1);
ItemStack dropStack = new ItemStack(TRBlocks.ADJUSTABLE_SU, 1);
writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 14/03/2016.
@ -41,7 +41,7 @@ public class TileHighVoltageSU extends TileEnergyStorage implements IContainerPr
* MFSU should store 40M FE with 2048 FE/t I/O
*/
public TileHighVoltageSU() {
super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000);
super("HIGH_VOLTAGE_SU", 2, TRBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000);
}
@Override

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 14/03/2016.
@ -37,7 +37,7 @@ import techreborn.init.ModBlocks;
public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileLowVoltageSU() {
super("BatBox", 2, ModBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000);
super("BatBox", 2, TRBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000);
}
@Override

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 14/03/2016.
@ -41,7 +41,7 @@ public class TileMediumVoltageSU extends TileEnergyStorage implements IContainer
* MFE should store 1.2M FE with 512 FE/t I/O
*/
public TileMediumVoltageSU() {
super("MEDIUM_VOLTAGE_SU", 2, ModBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000);
super("MEDIUM_VOLTAGE_SU", 2, TRBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000);
}
@Override

View file

@ -34,7 +34,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.storage.TileEnergyStorage;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -50,7 +50,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai
public String ownerUdid;
public TileInterdimensionalSU() {
super("IDSU", 2, ModBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
super("IDSU", 2, TRBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
}
@Override

View file

@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.api.IToolDrop;
import reborncore.common.tile.TileMachineBase;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
public class TileLSUStorage extends TileMachineBase
implements IToolDrop {
@ -95,6 +95,6 @@ public class TileLSUStorage extends TileMachineBase
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.LSU_STORAGE, 1);
return new ItemStack(TRBlocks.LSU_STORAGE, 1);
}
}

View file

@ -38,7 +38,7 @@ import techreborn.blocks.storage.BlockLapotronicSU;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.storage.TileEnergyStorage;
import java.util.ArrayList;
@ -59,7 +59,7 @@ public class TileLapotronicSU extends TileEnergyStorage implements IContainerPro
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>();
public TileLapotronicSU() {
super("LESU", 2, ModBlocks.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000);
super("LESU", 2, TRBlocks.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000);
checkOverfill = false;
}

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 16/03/2016.
@ -33,7 +33,7 @@ import techreborn.init.ModBlocks;
public class TileHVTransformer extends TileTransformer {
public TileHVTransformer() {
super("HVTransformer", ModBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME);
super("HVTransformer", TRBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME);
}
}

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 16/03/2016.
@ -33,7 +33,7 @@ import techreborn.init.ModBlocks;
public class TileLVTransformer extends TileTransformer {
public TileLVTransformer() {
super("LVTransformer", ModBlocks.LV_TRANSFORMER, EnumPowerTier.MEDIUM);
super("LVTransformer", TRBlocks.LV_TRANSFORMER, EnumPowerTier.MEDIUM);
}
}

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
/**
* Created by modmuss50 on 16/03/2016.
@ -33,6 +33,6 @@ import techreborn.init.ModBlocks;
public class TileMVTransformer extends TileTransformer {
public TileMVTransformer() {
super("MVTransformer", ModBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH);
super("MVTransformer", TRBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH);
}
}