Continue to make sense of things... this mod's a mess lol

This commit is contained in:
ProfessorProspector 2018-09-16 20:31:01 -07:00
parent d98802ee1b
commit 0b963dcda9
171 changed files with 269 additions and 234 deletions

View file

@ -36,16 +36,21 @@ import techreborn.client.gui.GuiAutoCrafting;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
import techreborn.tiles.generator.advanced.TileGasTurbine;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
import techreborn.tiles.machine.multiblock.*;
import techreborn.tiles.storage.TileAdjustableSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.tier1.*;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.tiles.machine.tier1.*;
public class GuiHandler implements IGuiHandler {

View file

@ -57,27 +57,27 @@ public class RegisterItemJsons {
register(TRItems.LITHIUM_ION_BATPACK, "tool/lithium_batpack");
// Battery
register(TRItems.RECHARGEABLE_BATTERY, "battery/re_battery");
register(TRItems.RED_CELL_BATTERY, "battery/re_battery");
register(TRItems.LITHIUM_ION_BATTERY, "battery/lithium_battery");
register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal");
register(TRItems.LAPOTRON_CRYSTAL, "battery/lapotron_crystal");
register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb");
// Tools
register(TRItems.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw");
register(TRItems.INDUSTRIAL_DRILL, "tool/industrial_drill");
register(TRItems.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer");
register(TRItems.DEBUG_TOOL, "misc/debug");
register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
register(TRItems.ADVANCED_DRILL, "tool/advanced_drill");
register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
register(TRItems.DEBUG_TOOL, "misc/debug");
register(TRItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw");
register(TRItems.DIAMOND_DRILL, "tool/diamond_drill");
register(TRItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer");
register(TRItems.ELECTRIC_TREE_TAP, "tool/electric_treetap");
register(TRItems.NANOSABER, "tool/nanosaber");
register(TRItems.OMNI_TOOL, "tool/omni_tool");
register(TRItems.ROCK_CUTTER, "tool/rock_cutter");
register(TRItems.STEEL_CHAINSAW, "tool/steel_chainsaw");
register(TRItems.STEEL_DRILL, "tool/steel_drill");
register(TRItems.STEEL_JACKHAMMER, "tool/steel_jackhammer");
register(TRItems.BASIC_CHAINSAW, "tool/basic_chainsaw");
register(TRItems.BASIC_DRILL, "tool/basic_drill");
register(TRItems.BASIC_JACKHAMMER, "tool/basic_jackhammer");
register(TRItems.TREE_TAP, "tool/treetap");
register(TRItems.WRENCH, "tool/wrench");

View file

@ -29,7 +29,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
public class GuiAlloyFurnace extends GuiContainer {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileAlloySmelter;
import techreborn.tiles.machine.tier1.TileAlloySmelter;
public class GuiAlloySmelter extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileAssemblingMachine;
import techreborn.tiles.machine.tier1.TileAssemblingMachine;
public class GuiAssemblingMachine extends GuiBase {

View file

@ -34,7 +34,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import reborncore.common.network.NetworkManager;
import techreborn.packets.PacketAutoCraftingTableLock;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import java.io.IOException;

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileChemicalReactor;
import techreborn.tiles.machine.tier1.TileChemicalReactor;
public class GuiChemicalReactor extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileCompressor;
import techreborn.tiles.machine.tier1.TileCompressor;
public class GuiCompressor extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.tiles.generator.TileDieselGenerator;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
@SideOnly(Side.CLIENT)
public class GuiDieselGenerator extends GuiBase {

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileDistillationTower;
import techreborn.tiles.machine.multiblock.TileDistillationTower;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileElectricFurnace;
import techreborn.tiles.machine.tier1.TileElectricFurnace;
public class GuiElectricFurnace extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileExtractor;
import techreborn.tiles.machine.tier1.TileExtractor;
public class GuiExtractor extends GuiBase {

View file

@ -35,7 +35,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileFluidReplicator;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileGasTurbine;
import techreborn.tiles.generator.advanced.TileGasTurbine;
public class GuiGasTurbine extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileSolidFuelGenerator;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
public class GuiGenerator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileGrinder;
import techreborn.tiles.machine.tier1.TileGrinder;
public class GuiGrinder extends GuiBase {

View file

@ -27,7 +27,7 @@ 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.TileInterdimensionalSU;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
public class GuiIDSU extends GuiBase {

View file

@ -35,7 +35,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileImplosionCompressor;
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
public class GuiIndustrialElectrolyzer extends GuiBase {

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialGrinder;
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
import java.io.IOException;

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
import java.io.IOException;

View file

@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import techreborn.init.TRItems;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
public class GuiIronFurnace extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
public class GuiLESU extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileRecycler;
import techreborn.tiles.machine.tier1.TileRecycler;
public class GuiRecycler extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.network.NetworkManager;
import techreborn.packets.PacketRollingMachineLock;
import techreborn.tiles.tier1.TileRollingMachine;
import techreborn.tiles.machine.tier1.TileRollingMachine;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileScrapboxinator;
import techreborn.tiles.machine.tier1.TileScrapboxinator;
public class GuiScrapboxinator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileSemiFluidGenerator;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
public class GuiSemifluidGenerator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileThermalGenerator;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
public class GuiThermalGenerator extends GuiBase {

View file

@ -34,7 +34,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileVacuumFreezer;
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
import java.io.IOException;