Renamed ModBlocks to TRBlocks
This commit is contained in:
parent
f02b24f813
commit
bf7f7ba871
86 changed files with 307 additions and 298 deletions
|
@ -31,7 +31,7 @@ import net.minecraft.util.ResourceLocation;
|
|||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.init.TRItems;
|
||||
|
||||
|
@ -120,11 +120,11 @@ public class RegisterItemJsons {
|
|||
registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool");
|
||||
}
|
||||
|
||||
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
|
||||
register(TRBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
|
||||
}
|
||||
|
||||
private static void registerBlocks() {
|
||||
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
||||
register(TRBlocks.REFINED_IRON_FENCE, "iron_fence");
|
||||
}
|
||||
|
||||
private static void register(Item item, int meta, String name) {
|
||||
|
|
|
@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
|
||||
|
||||
|
@ -112,43 +112,45 @@ public class GuiBlastFurnace extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
this.addComponent(0, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState();
|
||||
|
||||
this.addComponent(0, 0, 0, standardCasing, multiblock);
|
||||
this.addComponent(1, 0, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 0, 1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 0, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 0, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 0, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 0, 1, standardCasing, multiblock);
|
||||
this.addComponent(1, 0, -1, standardCasing, multiblock);
|
||||
this.addComponent(1, 0, 1, standardCasing, multiblock);
|
||||
|
||||
this.addComponent(1, 1, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 1, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 1, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 1, 1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 1, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 1, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 1, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 1, 1, standardCasing, multiblock);
|
||||
this.addComponent(1, 1, -1, standardCasing, multiblock);
|
||||
this.addComponent(1, 1, 1, standardCasing, multiblock);
|
||||
|
||||
this.addComponent(1, 2, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 2, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 2, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 2, 1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 2, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 2, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 2, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 2, 1, standardCasing, multiblock);
|
||||
this.addComponent(1, 2, -1, standardCasing, multiblock);
|
||||
this.addComponent(1, 2, 1, standardCasing, multiblock);
|
||||
|
||||
this.addComponent(0, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(-1, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(1, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock);
|
||||
this.addComponent(0, 3, 0, standardCasing, multiblock);
|
||||
this.addComponent(1, 3, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 3, 1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 3, 0, standardCasing, multiblock);
|
||||
this.addComponent(0, 3, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 3, -1, standardCasing, multiblock);
|
||||
this.addComponent(-1, 3, 1, standardCasing, multiblock);
|
||||
this.addComponent(1, 3, -1, standardCasing, multiblock);
|
||||
this.addComponent(1, 3, 1, standardCasing, multiblock);
|
||||
|
||||
final MultiblockSet set = new MultiblockSet(multiblock);
|
||||
ClientProxy.multiblockRenderEvent.setMultiblock(set);
|
||||
|
|
|
@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileDistillationTower;
|
||||
|
||||
|
@ -107,8 +107,8 @@ public class GuiDistillationTower extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
IBlockState advancedCasing = ModBlocks.MACHINE_CASINGS_ADVANCED.getDefaultState();
|
||||
IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState();
|
||||
IBlockState advancedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState();
|
||||
IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState();
|
||||
|
||||
this.addComponent(0, 0, 0, standardCasing, multiblock);
|
||||
this.addComponent(1, 0, 0, standardCasing, multiblock);
|
||||
|
|
|
@ -33,7 +33,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
|
||||
|
||||
|
@ -116,7 +116,7 @@ public class GuiFluidReplicator extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
final IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState();
|
||||
final IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState();
|
||||
|
||||
addComponent(1, 0, 0, reinforcedCasing, multiblock);
|
||||
addComponent(0, 0, 1, reinforcedCasing, multiblock);
|
||||
|
|
|
@ -37,7 +37,7 @@ import reborncore.common.powerSystem.PowerSystem;
|
|||
import reborncore.common.util.Torus;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.client.gui.widget.GuiButtonUpDown;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRBlocks;
|
||||
import techreborn.packets.PacketFusionControlSize;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||
|
@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase {
|
|||
|
||||
private void updateMultiBlockRender(){
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
IBlockState coil = ModBlocks.FUSION_COIL.getDefaultState();
|
||||
IBlockState coil = TRBlocks.FUSION_COIL.getDefaultState();
|
||||
|
||||
List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size);
|
||||
coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock));
|
||||
|
|
|
@ -33,7 +33,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
|
||||
|
||||
|
@ -113,7 +113,7 @@ public class GuiImplosionCompressor extends GuiBase {
|
|||
for (int y = -4; y <= -2; y++) {
|
||||
for (int z = -1; z <= 1; z++) {
|
||||
if (!((x == 0) && (y == -3) && (z == 0))) {
|
||||
this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(), multiblock);
|
||||
this.addComponent(x, y, z, TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(), multiblock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
|
||||
|
||||
|
@ -113,8 +113,8 @@ public class GuiIndustrialGrinder extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState();
|
||||
IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState();
|
||||
IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState();
|
||||
IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState();
|
||||
|
||||
this.addComponent(0, -1, 0, standardCasing, multiblock);
|
||||
this.addComponent(1, -1, 0, standardCasing, multiblock);
|
||||
|
|
|
@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
|
||||
|
||||
|
@ -112,8 +112,8 @@ public class GuiIndustrialSawmill extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState();
|
||||
IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState();
|
||||
IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState();
|
||||
IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState();
|
||||
|
||||
this.addComponent(0, -1, 0, standardCasing, multiblock);
|
||||
this.addComponent(1, -1, 0, standardCasing, multiblock);
|
||||
|
|
|
@ -32,7 +32,7 @@ import reborncore.client.multiblock.Multiblock;
|
|||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
|
||||
|
||||
|
@ -104,7 +104,7 @@ public class GuiVacuumFreezer extends GuiBase {
|
|||
{
|
||||
// This code here makes a basic multiblock and then sets to the selected one.
|
||||
final Multiblock multiblock = new Multiblock();
|
||||
IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState();
|
||||
IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState();
|
||||
|
||||
this.addComponent(0, -1, 0, reinforcedCasing, multiblock);
|
||||
this.addComponent(1, -1, 0, reinforcedCasing, multiblock);
|
||||
|
|
|
@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation;
|
|||
import net.minecraft.util.math.MathHelper;
|
||||
import techreborn.blocks.BlockNuke;
|
||||
import techreborn.entities.EntityNukePrimed;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.TRBlocks;
|
||||
|
||||
/**
|
||||
* Created by Mark on 13/03/2016.
|
||||
|
@ -61,7 +61,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
|||
}
|
||||
this.bindEntityTexture(entity);
|
||||
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
|
||||
blockrendererdispatcher.renderBlockBrightness(ModBlocks.NUKE.getDefaultState(),
|
||||
blockrendererdispatcher.renderBlockBrightness(TRBlocks.NUKE.getDefaultState(),
|
||||
entity.getBrightness());
|
||||
GlStateManager.translate(0.0F, 0.0F, 1.0F);
|
||||
if (entity.getFuse() / 5 % 2 == 0) {
|
||||
|
@ -72,7 +72,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
|||
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
|
||||
GlStateManager.enablePolygonOffset();
|
||||
blockrendererdispatcher.renderBlockBrightness(
|
||||
ModBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
|
||||
TRBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
|
||||
GlStateManager.doPolygonOffset(0.0F, 0.0F);
|
||||
GlStateManager.disablePolygonOffset();
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue