Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)

This commit is contained in:
Prospector 2017-06-14 08:56:09 -07:00
parent 1fa9f1cf52
commit 40e3062903
123 changed files with 1469 additions and 1486 deletions

View file

@ -62,9 +62,9 @@ public enum EGui {
IRON_FURNACE(true),
RECYCLER(true),
SCRAPBOXINATOR(true),
BATBOX(true),
MFSU(true),
MFE(true);
LOW_VOLTAGE_SU(true),
HIGH_VOLTAGE_SU(true),
MEDIUM_VOLTAGE_SU(true);
private final boolean containerBuilder;

View file

@ -33,14 +33,14 @@ import techreborn.client.container.*;
import techreborn.client.gui.*;
import techreborn.manual.GuiManual;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.teir1.*;
public class GuiHandler implements IGuiHandler {
@ -57,11 +57,11 @@ public class GuiHandler implements IGuiHandler {
switch (gui) {
case AESU:
return new ContainerAESU((TileAesu) tile, player);
return new ContainerAESU((TileAdjustableSU) tile, player);
case DESTRUCTOPACK:
return new ContainerDestructoPack(player);
case LESU:
return new ContainerLESU((TileLesu) tile, player);
return new ContainerLESU((TileLapotronicSU) tile, player);
default:
break;
}
@ -76,15 +76,15 @@ public class GuiHandler implements IGuiHandler {
switch (gui) {
case AESU:
return new GuiAESU(player, (TileAesu) tile);
return new GuiAESU(player, (TileAdjustableSU) tile);
case ALLOY_FURNACE:
return new GuiAlloyFurnace(player, (TileAlloyFurnace) tile);
return new GuiAlloyFurnace(player, (TileIronAlloyFurnace) tile);
case ALLOY_SMELTER:
return new GuiAlloySmelter(player, (TileAlloySmelter) tile);
case ASSEMBLING_MACHINE:
return new GuiAssemblingMachine(player, (TileAssemblingMachine) tile);
case BATBOX:
return new GuiBatbox(player, (TileBatBox) tile);
case LOW_VOLTAGE_SU:
return new GuiBatbox(player, (TileLowVoltageSU) tile);
case BLAST_FURNACE:
return new GuiBlastFurnace(player, (TileIndustrialBlastFurnace) tile);
case CENTRIFUGE:
@ -108,15 +108,15 @@ public class GuiHandler implements IGuiHandler {
case EXTRACTOR:
return new GuiExtractor(player, (TileExtractor) tile);
case FUSION_CONTROLLER:
return new GuiFusionReactor(player, (TileEntityFusionController) tile);
return new GuiFusionReactor(player, (TileFusionControlComputer) tile);
case GAS_TURBINE:
return new GuiGasTurbine(player, (TileGasTurbine) tile);
case GENERATOR:
return new GuiGenerator(player, (TileGenerator) tile);
return new GuiGenerator(player, (TileSolidFuelGenerator) tile);
case GRINDER:
return new GuiGrinder(player, (TileGrinder) tile);
case IDSU:
return new GuiIDSU(player, (TileIDSU) tile);
return new GuiIDSU(player, (TileInterdimensionalSU) tile);
case IMPLOSION_COMPRESSOR:
return new GuiImplosionCompressor(player, (TileImplosionCompressor) tile);
case INDUSTRIAL_ELECTROLYZER:
@ -126,15 +126,15 @@ public class GuiHandler implements IGuiHandler {
case IRON_FURNACE:
return new GuiIronFurnace(player, (TileIronFurnace) tile);
case LESU:
return new GuiLESU(player, (TileLesu) tile);
return new GuiLESU(player, (TileLapotronicSU) tile);
case MANUAL:
return new GuiManual();
case MATTER_FABRICATOR:
return new GuiMatterFabricator(player, (TileMatterFabricator) tile);
case MFE:
return new GuiMFE(player, (TileMFE) tile);
case MFSU:
return new GuiMFSU(player, (TileMFSU) tile);
case MEDIUM_VOLTAGE_SU:
return new GuiMFE(player, (TileMediumVoltageSU) tile);
case HIGH_VOLTAGE_SU:
return new GuiMFSU(player, (TileHighVoltageSU) tile);
case QUANTUM_CHEST:
return new GuiQuantumChest(player, (TileQuantumChest) tile);
case QUANTUM_TANK:
@ -148,7 +148,7 @@ public class GuiHandler implements IGuiHandler {
case SCRAPBOXINATOR:
return new GuiScrapboxinator(player, (TileScrapboxinator) tile);
case SEMIFLUID_GENERATOR:
return new GuiSemifluidGenerator(player, (TileSemifluidGenerator) tile);
return new GuiSemifluidGenerator(player, (TileSemiFluidGenerator) tile);
case THERMAL_GENERATOR:
return new GuiThermalGenerator(player, (TileThermalGenerator) tile);
case VACUUM_FREEZER:

View file

@ -33,10 +33,6 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.BlockStorage2;
import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.cable.EnumCableType;
import techreborn.config.ConfigTechReborn;
@ -165,26 +161,6 @@ public class RegisterItemJsons {
registerBlockstate(ModItems.UPGRADES, i, name[i], "items/misc/");
}
for (int i = 0; i < BlockOre.ores.length; ++i) {
String[] name = BlockOre.ores.clone();
registerBlockstate(ModBlocks.ORE, i, name[i]);
}
for (int i = 0; i < BlockOre2.ores.length; ++i) {
String[] name = BlockOre2.ores.clone();
registerBlockstate(ModBlocks.ORE2, i, name[i]);
}
for (int i = 0; i < BlockStorage.types.length; ++i) {
String[] name = BlockStorage.types.clone();
registerBlockstate(ModBlocks.STORAGE, i, name[i]);
}
for (int i = 0; i < BlockStorage2.types.length; ++i) {
String[] name = BlockStorage2.types.clone();
registerBlockstate(ModBlocks.STORAGE2, i, name[i]);
}
for (EnumCableType cableType : EnumCableType.values()) {
registerBlockstateMultiItem(Item.getItemFromBlock(ModBlocks.CABLE), cableType.ordinal(), cableType.getName().toLowerCase(), "cable_inv");
}

View file

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
public class ContainerAESU extends RebornContainer {
@ -38,9 +38,9 @@ public class ContainerAESU extends RebornContainer {
public int storedEu;
public int euChange;
EntityPlayer player;
TileAesu tile;
TileAdjustableSU tile;
public ContainerAESU(TileAesu tileaesu, EntityPlayer player) {
public ContainerAESU(TileAdjustableSU tileaesu, EntityPlayer player) {
tile = tileaesu;
this.player = player;

View file

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLapotronicSU;
public class ContainerLESU extends RebornContainer {
@ -40,9 +40,9 @@ public class ContainerLESU extends RebornContainer {
public int connectedBlocks;
public double euStorage;
EntityPlayer player;
TileLesu tile;
TileLapotronicSU tile;
public ContainerLESU(TileLesu tileaesu, EntityPlayer player) {
public ContainerLESU(TileLapotronicSU tileaesu, EntityPlayer player) {
tile = tileaesu;
this.player = player;
@ -111,7 +111,7 @@ public class ContainerLESU extends RebornContainer {
} else if (id == 4) {
this.euStorage = value;
}
this.euStorage = ((connectedBlocks + 1) * TileLesu.storagePerBlock);
this.euStorage = ((connectedBlocks + 1) * TileLapotronicSU.storagePerBlock);
}
}

View file

@ -34,7 +34,7 @@ import reborncore.common.network.NetworkManager;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.container.ContainerAESU;
import techreborn.packets.PacketAesu;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAdjustableSU;
import java.awt.*;
import java.io.IOException;
@ -43,11 +43,11 @@ public class GuiAESU extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png");
TileAesu aesu;
TileAdjustableSU aesu;
ContainerAESU containerAesu;
public GuiAESU(EntityPlayer player, TileAesu tileaesu) {
public GuiAESU(EntityPlayer player, TileAdjustableSU tileaesu) {
super(new ContainerAESU(tileaesu, player));
this.xSize = 176;
this.ySize = 197;

View file

@ -29,16 +29,16 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileIronAlloyFurnace;
public class GuiAlloyFurnace extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/alloy_furnace.png");
TileAlloyFurnace alloyfurnace;
TileIronAlloyFurnace alloyfurnace;
public GuiAlloyFurnace(final EntityPlayer player, final TileAlloyFurnace alloyFurnace) {
public GuiAlloyFurnace(final EntityPlayer player, final TileIronAlloyFurnace alloyFurnace) {
super(alloyFurnace.createContainer(player));
this.xSize = 176;
this.ySize = 167;

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileLowVoltageSU;
public class GuiBatbox extends GuiBase {
TileBatBox tile;
TileLowVoltageSU tile;
public GuiBatbox(final EntityPlayer player, final TileBatBox tile) {
public GuiBatbox(final EntityPlayer player, final TileLowVoltageSU tile) {
super(player, tile, tile.createContainer(player));
this.tile = tile;
}

View file

@ -38,7 +38,7 @@ import reborncore.common.misc.Location;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.ClientMultiBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import java.io.IOException;
@ -47,9 +47,9 @@ public class GuiFusionReactor extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/fusion_reactor.png");
TileEntityFusionController fusionController;
TileFusionControlComputer fusionController;
public GuiFusionReactor(final EntityPlayer player, final TileEntityFusionController fusion) {
public GuiFusionReactor(final EntityPlayer player, final TileFusionControlComputer fusion) {
super(fusion.createContainer(player));
this.fusionController = fusion;
}

View file

@ -25,13 +25,13 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileGenerator;
import techreborn.tiles.generator.TileSolidFuelGenerator;
public class GuiGenerator extends GuiBase {
TileGenerator tile;
TileSolidFuelGenerator tile;
public GuiGenerator(final EntityPlayer player, final TileGenerator tile) {
public GuiGenerator(final EntityPlayer player, final TileSolidFuelGenerator tile) {
super(player, tile, tile.createContainer(player));
this.tile = tile;
}

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.idsu.TileInterdimensionalSU;
public class GuiIDSU extends GuiBase {
TileIDSU idsu;
TileInterdimensionalSU idsu;
public GuiIDSU(EntityPlayer player, TileIDSU tileIDSU) {
public GuiIDSU(EntityPlayer player, TileInterdimensionalSU tileIDSU) {
super(player, tileIDSU, tileIDSU.createContainer(player));
this.xSize = 176;
this.ySize = 197;

View file

@ -31,7 +31,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.container.ContainerLESU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLapotronicSU;
import java.awt.*;
@ -39,11 +39,11 @@ public class GuiLESU extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png");
TileLesu aesu;
TileLapotronicSU aesu;
ContainerLESU containerLesu;
public GuiLESU(EntityPlayer player, TileLesu tileaesu) {
public GuiLESU(EntityPlayer player, TileLapotronicSU tileaesu) {
super(new ContainerLESU(tileaesu, player));
this.xSize = 176;
this.ySize = 197;

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMediumVoltageSU;
public class GuiMFE extends GuiBase {
TileMFE mfe;
TileMediumVoltageSU mfe;
public GuiMFE(final EntityPlayer player, final TileMFE mfe) {
public GuiMFE(final EntityPlayer player, final TileMediumVoltageSU mfe) {
super(player, mfe, mfe.createContainer(player));
this.mfe = mfe;
}

View file

@ -27,13 +27,13 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.storage.TileHighVoltageSU;
public class GuiMFSU extends GuiBase {
TileMFSU mfsu;
TileHighVoltageSU mfsu;
public GuiMFSU(final EntityPlayer player, final TileMFSU mfsu) {
public GuiMFSU(final EntityPlayer player, final TileHighVoltageSU mfsu) {
super(player, mfsu, mfsu.createContainer(player));
this.mfsu = mfsu;
}

View file

@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
import reborncore.client.RenderUtil;
import techreborn.tiles.generator.TileSemifluidGenerator;
import techreborn.tiles.generator.TileSemiFluidGenerator;
public class GuiSemifluidGenerator extends GuiContainer {
@ -38,9 +38,9 @@ public class GuiSemifluidGenerator extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/semifluid_generator.png");
TileSemifluidGenerator semifluidGenerator;
TileSemiFluidGenerator semifluidGenerator;
public GuiSemifluidGenerator(final EntityPlayer player, final TileSemifluidGenerator semifluidGenerator) {
public GuiSemifluidGenerator(final EntityPlayer player, final TileSemiFluidGenerator semifluidGenerator) {
super(semifluidGenerator.createContainer(player));
this.xSize = 176;
this.ySize = 167;