Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # src/main/java/techreborn/blocks/BlockRubberLog.java # src/main/java/techreborn/client/gui/GuiAlloySmelter.java # src/main/java/techreborn/client/gui/GuiAssemblingMachine.java # src/main/java/techreborn/client/gui/GuiChemicalReactor.java # src/main/java/techreborn/client/gui/GuiCompressor.java # src/main/java/techreborn/client/gui/GuiDieselGenerator.java # src/main/java/techreborn/client/gui/GuiElectricFurnace.java # src/main/java/techreborn/client/gui/GuiExtractor.java # src/main/java/techreborn/client/gui/GuiGasTurbine.java # src/main/java/techreborn/client/gui/GuiGrinder.java # src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java # src/main/java/techreborn/client/gui/GuiIronFurnace.java # src/main/java/techreborn/client/gui/GuiRecycler.java # src/main/java/techreborn/client/gui/GuiScrapboxinator.java # src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java # src/main/java/techreborn/client/gui/GuiThermalGenerator.java # src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java # src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java # src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java # src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java # src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java # src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java # src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java # src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java # src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java # src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java # src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java # src/main/java/techreborn/events/StackToolTipEvent.java # src/main/java/techreborn/items/armor/ItemCloakingDevice.java # src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java # src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java # src/main/java/techreborn/items/battery/ItemBattery.java # src/main/java/techreborn/items/battery/ItemEnergyCrystal.java # src/main/java/techreborn/items/battery/ItemLapotronCrystal.java # src/main/java/techreborn/items/battery/ItemLapotronicOrb.java # src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java # src/main/java/techreborn/items/battery/ItemRedCellBattery.java # src/main/java/techreborn/items/tool/ItemChainsaw.java # src/main/java/techreborn/items/tool/ItemDrill.java # src/main/java/techreborn/items/tool/ItemJackhammer.java # src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java # src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java # src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java # src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java # src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java # src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java # src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java # src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java # src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java # src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java # src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java # src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java # src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java # src/main/java/techreborn/tiles/TileChargeOMat.java # src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
This commit is contained in:
parent
7df4742784
commit
43cf6d7807
29 changed files with 31 additions and 26 deletions
|
@ -45,6 +45,8 @@ import net.minecraftforge.energy.CapabilityEnergy;
|
|||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
import reborncore.client.models.RebornModelRegistry;
|
||||
import reborncore.common.powerSystem.ExternalPowerSystems;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.util.WorldUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.events.TRRecipeHandler;
|
||||
|
|
|
@ -26,6 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileAlloySmelter;
|
||||
|
||||
public class GuiAlloySmelter extends GuiBase {
|
||||
|
|
|
@ -33,7 +33,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.network.NetworkManager;
|
||||
import techreborn.packets.PacketAutoCraftingTableLock;
|
||||
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
|
||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.TileIndustrialCentrifuge;
|
||||
|
||||
public class GuiCentrifuge extends GuiBase {
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileChemicalReactor;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileCompressor;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiCompressor extends GuiBase {
|
||||
|
||||
|
|
|
@ -28,11 +28,12 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.generator.advanced.TileDieselGenerator;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiDieselGenerator extends GuiBase {
|
||||
|
||||
|
||||
TileDieselGenerator tile;
|
||||
|
||||
public GuiDieselGenerator(final EntityPlayer player, final TileDieselGenerator tile) {
|
||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileElectricFurnace;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiElectricFurnace extends GuiBase {
|
||||
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileExtractor;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiExtractor extends GuiBase {
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ import net.minecraft.util.EnumFacing;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos;
|
|||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.generator.advanced.TileGasTurbine;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiGasTurbine extends GuiBase {
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileGrinder;
|
||||
|
||||
public class GuiGrinder extends GuiBase {
|
||||
|
|
|
@ -31,7 +31,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiIndustrialElectrolyzer extends GuiBase {
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.TileMatterFabricator;
|
||||
|
||||
public class GuiMatterFabricator extends GuiBase {
|
||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.generator.TilePlasmaGenerator;
|
||||
|
||||
/**
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileRecycler;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.network.NetworkManager;
|
||||
import techreborn.packets.PacketRollingMachineLock;
|
||||
import techreborn.tiles.machine.tier1.TileRollingMachine;
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileScrapboxinator;
|
||||
|
||||
public class GuiScrapboxinator extends GuiBase {
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
|
||||
public class GuiSemifluidGenerator extends GuiBase {
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.tiles.generator.advanced.TileThermalGenerator;
|
||||
|
||||
public class GuiThermalGenerator extends GuiBase {
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.ClientProxy;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.guibuilder.GuiBuilder;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
|
|
|
@ -41,8 +41,8 @@ public class AlloySmelterRecipes extends RecipeMethods {
|
|||
|
||||
public static void init() {
|
||||
|
||||
OreRecipeInput ingotCopper3 = new OreRecipeInput("ingotCopper", 3);
|
||||
OreRecipeInput dustCopper3 = new OreRecipeInput("dustCopper", 3);
|
||||
// OreRecipeInput ingotCopper3 = new OreRecipeInput("ingotCopper", 3);
|
||||
// OreRecipeInput dustCopper3 = new OreRecipeInput("dustCopper", 3);
|
||||
|
||||
// // Bronze
|
||||
//// TODO: Fix Recipe
|
||||
|
|
|
@ -64,7 +64,6 @@ public class ClientProxy extends CommonProxy {
|
|||
StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter());
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke());
|
||||
MinecraftForge.EVENT_BUS.register(new IconSupplier());
|
||||
ModelDynamicCell.init();
|
||||
MinecraftForge.EVENT_BUS.register(ClientEventHandler.class);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue