Fixed warnings for Location and getStateFromMeta

This commit is contained in:
drcrazy 2017-10-01 03:03:05 +03:00
parent 1b4fee595d
commit 1c95ca4967
4 changed files with 58 additions and 53 deletions

View file

@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockPos;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.client.multiblock.MultiblockSet; import reborncore.client.multiblock.MultiblockSet;
import reborncore.common.misc.Location;
import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
@ -154,8 +153,9 @@ public class GuiBlastFurnace extends GuiBase {
final MultiblockSet set = new MultiblockSet(multiblock); final MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), ClientProxy.multiblockRenderEvent.parent = this.tile.getPos();
this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); // new Location(this.tile.getPos().getX(),
// this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld());
MultiblockRenderEvent.anchor = new BlockPos( MultiblockRenderEvent.anchor = new BlockPos(
this.tile.getPos().getX() this.tile.getPos().getX()
- EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetX() * 2, - EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetX() * 2,

View file

@ -34,7 +34,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.client.multiblock.MultiblockSet; import reborncore.client.multiblock.MultiblockSet;
import reborncore.common.misc.Location;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.ClientMultiBlocks; import techreborn.client.ClientMultiBlocks;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
@ -47,11 +46,11 @@ public class GuiFusionReactor extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation("techreborn", public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/fusion_reactor.png"); "textures/gui/fusion_reactor.png");
TileFusionControlComputer fusionController; TileFusionControlComputer tile;
public GuiFusionReactor(final EntityPlayer player, final TileFusionControlComputer fusion) { public GuiFusionReactor(final EntityPlayer player, final TileFusionControlComputer fusion) {
super(fusion.createContainer(player)); super(fusion.createContainer(player));
this.fusionController = fusion; this.tile = fusion;
} }
@Override @Override
@ -61,13 +60,13 @@ public class GuiFusionReactor extends GuiContainer {
this.fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(this.fusionController.getEnergy()), 11, 8, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(this.tile.getEnergy()), 11, 8,
16448255); 16448255);
this.fontRenderer.drawString("Coils: " + (this.fusionController.getCoilStatus() == 1 ? "Yes" : "No"), 11, 16, this.fontRenderer.drawString("Coils: " + (this.tile.getCoilStatus() == 1 ? "Yes" : "No"), 11, 16,
16448255); 16448255);
if (this.fusionController.getNeededPower() > 1 && this.fusionController.getCrafingTickTime() < 1) if (this.tile.getNeededPower() > 1 && this.tile.getCrafingTickTime() < 1)
this.fontRenderer.drawString("Start: " this.fontRenderer.drawString("Start: "
+ this.percentage(this.fusionController.getNeededPower(), (int) this.fusionController.getEnergy()) + this.percentage(this.tile.getNeededPower(), (int) this.tile.getEnergy())
+ "%", 11, 24, 16448255); + "%", 11, 24, 16448255);
} }
@ -80,10 +79,10 @@ public class GuiFusionReactor extends GuiContainer {
this.buttonList.add(button); this.buttonList.add(button);
super.initGui(); super.initGui();
final BlockPos coordinates = new BlockPos( final BlockPos coordinates = new BlockPos(
this.fusionController.getPos().getX() this.tile.getPos().getX()
- EnumFacing.getFront(this.fusionController.getFacingInt()).getFrontOffsetX() * 2, - EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetX() * 2,
this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ() this.tile.getPos().getY() - 1, this.tile.getPos().getZ()
- EnumFacing.getFront(this.fusionController.getFacingInt()).getFrontOffsetZ() * 2); - EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetZ() * 2);
if (coordinates.equals(MultiblockRenderEvent.anchor)) { if (coordinates.equals(MultiblockRenderEvent.anchor)) {
ClientProxy.multiblockRenderEvent.setMultiblock(null); ClientProxy.multiblockRenderEvent.setMultiblock(null);
button.displayString = "B"; button.displayString = "B";
@ -105,7 +104,7 @@ public class GuiFusionReactor extends GuiContainer {
this.drawTexturedModalRect(k + 88, l + 36, 176, 0, 14, 14); this.drawTexturedModalRect(k + 88, l + 36, 176, 0, 14, 14);
// progressBar // progressBar
this.drawTexturedModalRect(k + 111, l + 34, 176, 14, this.fusionController.getProgressScaled(), 16); this.drawTexturedModalRect(k + 111, l + 34, 176, 14, this.tile.getProgressScaled(), 16);
} }
@ -124,11 +123,12 @@ public class GuiFusionReactor extends GuiContainer {
// theselected one. // theselected one.
final MultiblockSet set = new MultiblockSet(ClientMultiBlocks.reactor); final MultiblockSet set = new MultiblockSet(ClientMultiBlocks.reactor);
ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.parent = new Location(this.fusionController.getPos().getX(), ClientProxy.multiblockRenderEvent.parent = this.tile.getPos();
this.fusionController.getPos().getY(), this.fusionController.getPos().getZ(), // new Location(this.fusionController.getPos().getX(),
this.fusionController.getWorld()); // this.fusionController.getPos().getY(), this.fusionController.getPos().getZ(),
MultiblockRenderEvent.anchor = new BlockPos(this.fusionController.getPos().getX(), // this.fusionController.getWorld());
this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ()); MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(),
this.tile.getPos().getY() - 1, this.tile.getPos().getZ());
button.displayString = "A"; button.displayString = "A";
} else { } else {

View file

@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.client.multiblock.MultiblockSet; import reborncore.client.multiblock.MultiblockSet;
import reborncore.common.misc.Location; import techreborn.blocks.BlockMachineCasing;
import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
@ -116,7 +116,7 @@ public class GuiImplosionCompressor extends GuiBase {
for (int y = -4; y <= -2; y++) { for (int y = -4; y <= -2; y++) {
for (int z = -1; z <= 1; z++) { for (int z = -1; z <= 1; z++) {
if (!((x == 0) && (y == -3) && (z == 0))) { if (!((x == 0) && (y == -3) && (z == 0))) {
this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS.getDefaultState().withProperty(BlockMachineCasing.TYPE, "reinforced"), multiblock);
} }
} }
} }
@ -124,7 +124,8 @@ public class GuiImplosionCompressor extends GuiBase {
final MultiblockSet set = new MultiblockSet(multiblock); final MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); ClientProxy.multiblockRenderEvent.parent = this.tile.getPos();
//new Location(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld());
MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ()); MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ());
} }
} else { } else {

View file

@ -33,7 +33,7 @@ import net.minecraft.util.math.BlockPos;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.client.multiblock.MultiblockSet; import reborncore.client.multiblock.MultiblockSet;
import reborncore.common.misc.Location; import techreborn.blocks.BlockMachineCasing;
import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
@ -112,41 +112,45 @@ public class GuiIndustrialGrinder extends GuiBase {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
final Multiblock multiblock = new Multiblock(); final Multiblock multiblock = new Multiblock();
this.addComponent(0, -1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); IBlockState standardCasing = ModBlocks.MACHINE_CASINGS.getDefaultState().withProperty(BlockMachineCasing.TYPE, "standard");
this.addComponent(1, -1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS.getDefaultState().withProperty(BlockMachineCasing.TYPE, "reinforced");
this.addComponent(0, -1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock);
this.addComponent(-1, -1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, -1, 0, standardCasing, multiblock);
this.addComponent(0, -1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(1, -1, 0, standardCasing, multiblock);
this.addComponent(-1, -1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, -1, 1, standardCasing, multiblock);
this.addComponent(-1, -1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(-1, -1, 0, standardCasing, multiblock);
this.addComponent(1, -1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, -1, -1, standardCasing, multiblock);
this.addComponent(1, -1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), 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(0, 0, 0, Blocks.WATER.getDefaultState(), multiblock); this.addComponent(0, 0, 0, Blocks.WATER.getDefaultState(), multiblock);
this.addComponent(1, 0, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(1, 0, 0, reinforcedCasing, multiblock);
this.addComponent(0, 0, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(0, 0, 1, reinforcedCasing, multiblock);
this.addComponent(-1, 0, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(-1, 0, 0, reinforcedCasing, multiblock);
this.addComponent(0, 0, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(0, 0, -1, reinforcedCasing, multiblock);
this.addComponent(-1, 0, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(-1, 0, -1, reinforcedCasing, multiblock);
this.addComponent(-1, 0, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(-1, 0, 1, reinforcedCasing, multiblock);
this.addComponent(1, 0, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(1, 0, -1, reinforcedCasing, multiblock);
this.addComponent(1, 0, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); this.addComponent(1, 0, 1, reinforcedCasing, multiblock);
this.addComponent(0, 1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, 1, 0, standardCasing, multiblock);
this.addComponent(0, 1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, 1, 0, standardCasing, multiblock);
this.addComponent(1, 1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(1, 1, 0, standardCasing, multiblock);
this.addComponent(0, 1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, 1, 1, standardCasing, multiblock);
this.addComponent(-1, 1, 0, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(-1, 1, 0, standardCasing, multiblock);
this.addComponent(0, 1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(0, 1, -1, standardCasing, multiblock);
this.addComponent(-1, 1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(-1, 1, -1, standardCasing, multiblock);
this.addComponent(-1, 1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(-1, 1, 1, standardCasing, multiblock);
this.addComponent(1, 1, -1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(1, 1, -1, standardCasing, multiblock);
this.addComponent(1, 1, 1, ModBlocks.MACHINE_CASINGS.getStateFromMeta(0), multiblock); this.addComponent(1, 1, 1, standardCasing, multiblock);
final MultiblockSet set = new MultiblockSet(multiblock); final MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), ClientProxy.multiblockRenderEvent.parent = this.tile.getPos();
this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); //new Location(this.tile.getPos().getX(),
//this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld());
MultiblockRenderEvent.anchor = new BlockPos( MultiblockRenderEvent.anchor = new BlockPos(
this.tile.getPos().getX() this.tile.getPos().getX()
- EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetX() * 2, - EnumFacing.getFront(this.tile.getFacingInt()).getFrontOffsetX() * 2,