Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # build.gradle # src/main/java/techreborn/TechReborn.java # src/main/java/techreborn/blocks/BlockNuke.java # src/main/java/techreborn/blocks/BlockOre.java # src/main/java/techreborn/blocks/BlockRubberLog.java # src/main/java/techreborn/blocks/generator/BlockSolarPanel.java # src/main/java/techreborn/client/RegisterItemJsons.java # src/main/java/techreborn/client/container/builder/BuiltContainer.java # src/main/java/techreborn/client/container/builder/ContainerBuilder.java # src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java # src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java # src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java # src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java # src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java # src/main/java/techreborn/client/gui/GuiAESU.java # src/main/java/techreborn/client/gui/GuiAlloySmelter.java # src/main/java/techreborn/client/gui/GuiAssemblingMachine.java # src/main/java/techreborn/client/gui/GuiBase.java # src/main/java/techreborn/client/gui/GuiBlastFurnace.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/GuiDigitalChest.java # src/main/java/techreborn/client/gui/GuiDistillationTower.java # src/main/java/techreborn/client/gui/GuiElectricFurnace.java # src/main/java/techreborn/client/gui/GuiExtractor.java # src/main/java/techreborn/client/gui/GuiFluidReplicator.java # src/main/java/techreborn/client/gui/GuiFusionReactor.java # src/main/java/techreborn/client/gui/GuiGasTurbine.java # src/main/java/techreborn/client/gui/GuiGenerator.java # src/main/java/techreborn/client/gui/GuiGrinder.java # src/main/java/techreborn/client/gui/GuiImplosionCompressor.java # src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java # src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java # src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java # src/main/java/techreborn/client/gui/GuiIronFurnace.java # src/main/java/techreborn/client/gui/GuiManual.java # src/main/java/techreborn/client/gui/GuiQuantumChest.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/client/gui/GuiVacuumFreezer.java # src/main/java/techreborn/client/gui/TRBuilder.java # src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java # src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java # src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java # src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java # src/main/java/techreborn/client/gui/slot/elements/ElementBase.java # src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java # src/main/java/techreborn/client/gui/slot/elements/ISprite.java # src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java # src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java # src/main/java/techreborn/client/gui/slot/elements/Sprite.java # src/main/java/techreborn/compat/CompatManager.java # src/main/java/techreborn/compat/ICompatModule.java # src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java # src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java # src/main/java/techreborn/compat/jei/RecipeUtil.java # src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java # src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.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/fusionReactor/FusionReactorRecipeCategory.java # src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java # src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.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/industrialGrinder/IndustrialGrinderRecipeWrapper.java # src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java # src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java # src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java # src/main/java/techreborn/events/BlockBreakHandler.java # src/main/java/techreborn/events/StackToolTipEvent.java # src/main/java/techreborn/init/IC2Duplicates.java # src/main/java/techreborn/init/ModItems.java # src/main/java/techreborn/init/ModRecipes.java # src/main/java/techreborn/init/OreDict.java # src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java # src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java # src/main/java/techreborn/init/recipes/CraftingTableRecipes.java # src/main/java/techreborn/init/recipes/FusionReactorRecipes.java # src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java # src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java # src/main/java/techreborn/init/recipes/RollingMachineRecipes.java # src/main/java/techreborn/init/recipes/ScrapboxRecipes.java # src/main/java/techreborn/items/ItemDestructopack.java # src/main/java/techreborn/items/ItemFrequencyTransmitter.java # src/main/java/techreborn/items/ItemManual.java # src/main/java/techreborn/items/ItemMissingRecipe.java # src/main/java/techreborn/items/ItemScrapBox.java # src/main/java/techreborn/items/ItemTechManual.java # src/main/java/techreborn/items/ItemUUmatter.java # src/main/java/techreborn/items/ItemUpgrade.java # src/main/java/techreborn/items/ItemUpgrades.java # src/main/java/techreborn/items/armor/ItemCloakingDevice.java # src/main/java/techreborn/items/ingredients/ItemDusts.java # src/main/java/techreborn/items/ingredients/ItemDustsSmall.java # src/main/java/techreborn/items/ingredients/ItemGems.java # src/main/java/techreborn/items/ingredients/ItemIngots.java # src/main/java/techreborn/items/ingredients/ItemNuggets.java # src/main/java/techreborn/items/ingredients/ItemParts.java # src/main/java/techreborn/items/ingredients/ItemPlates.java # src/main/java/techreborn/items/ingredients/ItemUUmatter.java # src/main/java/techreborn/items/tool/ItemDebugTool.java # src/main/java/techreborn/items/tool/ItemTreeTap.java # src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java # src/main/java/techreborn/items/tools/ItemTechManual.java # src/main/java/techreborn/items/tools/ItemTreeTap.java # src/main/java/techreborn/items/tools/ItemWrench.java # src/main/java/techreborn/lib/ModInfo.java # src/main/java/techreborn/proxies/ClientProxy.java # src/main/java/techreborn/tiles/TileChargeOMat.java # src/main/java/techreborn/tiles/TileChunkLoader.java # src/main/java/techreborn/tiles/TileDigitalChest.java # src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java # src/main/java/techreborn/tiles/TileMatterFabricator.java # src/main/java/techreborn/tiles/TileQuantumChest.java # src/main/java/techreborn/tiles/TileQuantumTank.java # src/main/java/techreborn/tiles/cable/TileCable.java # src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java # src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java # src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java # src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java # src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java # src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java # src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java # src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java # src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java # src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java # src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java # src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java # src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java # src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java # src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java # src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java # src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java # src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java # src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java # src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java # src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java # src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java # src/main/java/techreborn/tiles/storage/TileAdjustableSU.java # src/main/java/techreborn/tiles/storage/TileEnergyStorage.java # src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java # src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java # src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java # src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java # src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java # src/main/java/techreborn/utils/StackWIPHandler.java # src/main/java/techreborn/world/TechRebornRetroGen.java # src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
This commit is contained in:
parent
4440c2f305
commit
c064b72bc5
26 changed files with 14 additions and 61 deletions
|
@ -56,8 +56,6 @@ import reborncore.common.util.Torus;
|
|||
import techreborn.api.TechRebornAPI;
|
||||
import techreborn.client.GuiHandler;
|
||||
import techreborn.command.TechRebornDevCommand;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.compat.ICompatModule;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.entities.EntityNukePrimed;
|
||||
import techreborn.events.BlockBreakHandler;
|
||||
|
@ -128,10 +126,6 @@ public class TechReborn {
|
|||
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
||||
|
||||
proxy.preInit(event);
|
||||
|
||||
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||
compatModule.preInit(event);
|
||||
}
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
|
@ -141,11 +135,6 @@ public class TechReborn {
|
|||
MinecraftForge.EVENT_BUS.register(new ModLoot());
|
||||
// Sounds
|
||||
ModSounds.init();
|
||||
|
||||
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||
compatModule.init(event);
|
||||
}
|
||||
|
||||
// Client only init, needs to be done before parts system
|
||||
proxy.init(event);
|
||||
// WorldGen
|
||||
|
|
|
@ -126,7 +126,7 @@ public class BlockCable extends BlockContainer {
|
|||
@Nullable
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World worldIn, int meta) {
|
||||
return new TileCable(getStateFromMeta(meta).getValue(TYPE));
|
||||
return new TileCable();
|
||||
}
|
||||
|
||||
// Block
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
package techreborn.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.builder.TRBuilder;
|
||||
import techreborn.tiles.machine.tier1.TileAlloySmelter;
|
||||
|
||||
public class GuiAlloySmelter extends GuiBase {
|
||||
|
|
|
@ -43,11 +43,6 @@ import techreborn.api.recipe.machines.VacuumFreezerRecipe;
|
|||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.recipes.*;
|
||||
import techreborn.items.*;
|
||||
import techreborn.items.ingredients.ItemDusts;
|
||||
import techreborn.items.ingredients.ItemDustsSmall;
|
||||
import techreborn.items.ingredients.ItemIngots;
|
||||
import techreborn.items.ingredients.ItemPlates;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
|
|
@ -27,14 +27,6 @@ package techreborn.init;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import techreborn.api.ISubItemRetriever;
|
||||
import techreborn.items.*;
|
||||
import techreborn.items.ingredients.ItemDusts;
|
||||
import techreborn.items.ingredients.ItemDustsSmall;
|
||||
import techreborn.items.ingredients.ItemGems;
|
||||
import techreborn.items.ingredients.ItemIngots;
|
||||
import techreborn.items.ingredients.ItemNuggets;
|
||||
import techreborn.items.ingredients.ItemParts;
|
||||
import techreborn.items.ingredients.ItemPlates;
|
||||
|
||||
/**
|
||||
* Created by Mark on 03/04/2016.
|
||||
*/
|
||||
|
|
|
@ -32,13 +32,6 @@ import net.minecraftforge.oredict.OreDictionary;
|
|||
import reborncore.common.util.OreUtil;
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.items.*;
|
||||
import techreborn.items.ingredients.ItemDusts;
|
||||
import techreborn.items.ingredients.ItemDustsSmall;
|
||||
import techreborn.items.ingredients.ItemGems;
|
||||
import techreborn.items.ingredients.ItemIngots;
|
||||
import techreborn.items.ingredients.ItemNuggets;
|
||||
import techreborn.items.ingredients.ItemParts;
|
||||
import techreborn.items.ingredients.ItemPlates;
|
||||
|
||||
/**
|
||||
* Created by Prospector
|
||||
|
|
|
@ -65,7 +65,6 @@ public class ClientProxy extends CommonProxy {
|
|||
RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke());
|
||||
MinecraftForge.EVENT_BUS.register(new IconSupplier());
|
||||
ModelDynamicCell.init();
|
||||
MinecraftForge.EVENT_BUS.register(new FluidBlockModelHandler());
|
||||
MinecraftForge.EVENT_BUS.register(ClientEventHandler.class);
|
||||
}
|
||||
|
||||
|
@ -79,7 +78,7 @@ public class ClientProxy extends CommonProxy {
|
|||
ClientRegistry.registerKeyBinding(KeyBindings.config);
|
||||
StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build();
|
||||
ModelLoader.setCustomStateMapper(TRContent.RUBBER_LEAVES, rubberLeavesStateMap);
|
||||
GuiBase.wrenchStack = new ItemStack(ModItems.WRENCH);
|
||||
GuiBase.wrenchStack = new ItemStack(TRContent.WRENCH);
|
||||
GuiBase.fluidCellProvider = DynamicCell::getCellWithFluid;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileChargeOMat extends TilePowerAcceptor
|
||||
|
|
|
@ -39,8 +39,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.items.ingredients.ItemParts;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileMatterFabricator extends TilePowerAcceptor
|
||||
|
|
|
@ -243,10 +243,11 @@ public class TileCable extends TileEntity
|
|||
public void addInfo(List<String> info, boolean isRealTile, boolean hasData) {
|
||||
if (isRealTile) {
|
||||
info.add(TextFormatting.GRAY + StringUtils.t("techreborn.tooltip.transferRate") + ": "
|
||||
+ TextFormatting.GOLD
|
||||
+ PowerSystem.getLocaliszedPowerFormatted(transferRate / RebornCoreConfig.euPerFU) + "/t");
|
||||
+ TextFormatting.GOLD
|
||||
+ PowerSystem.getLocaliszedPowerFormatted(transferRate / RebornCoreConfig.euPerFU) + "/t");
|
||||
info.add(TextFormatting.GRAY + StringUtils.t("techreborn.tooltip.tier") + ": "
|
||||
+ TextFormatting.GOLD + StringUtils.toFirstCapitalAllLowercase(cableType.tier.toString()));
|
||||
+ TextFormatting.GOLD + StringUtils.toFirstCapitalAllLowercase(cableType.tier.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
// IToolDrop
|
||||
|
|
|
@ -34,7 +34,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TilePlasmaGenerator extends TileBaseFluidGenerator implements IContainerProvider {
|
||||
|
|
|
@ -35,7 +35,6 @@ import techreborn.tiles.generator.TileBaseFluidGenerator;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileGasTurbine extends TileBaseFluidGenerator implements IContainerProvider {
|
||||
|
|
|
@ -35,7 +35,6 @@ import techreborn.tiles.generator.TileBaseFluidGenerator;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IContainerProvider {
|
||||
|
|
|
@ -35,7 +35,6 @@ import techreborn.tiles.generator.TileBaseFluidGenerator;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileThermalGenerator extends TileBaseFluidGenerator implements IContainerProvider {
|
||||
|
|
|
@ -47,7 +47,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileIronAlloyFurnace extends TileMachineBase
|
||||
|
|
|
@ -37,7 +37,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
|
|
|
@ -40,7 +40,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
|
|
@ -36,7 +36,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
|
|
|
@ -45,7 +45,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.multiblocks.MultiBlockCasing;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
import techreborn.tiles.TileMachineCasing;
|
||||
|
@ -62,7 +61,7 @@ public class TileIndustrialBlastFurnace extends TileGenericMachine implements IC
|
|||
private int cachedHeat;
|
||||
|
||||
public TileIndustrialBlastFurnace() {
|
||||
super("IndustrialBlastFurnace", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_BLAST_FURNACE, 4);
|
||||
super("IndustrialBlastFurnace", maxInput, maxEnergy, TRContent.Machine.INDUSTRIAL_BLAST_FURNACE.block, 4);
|
||||
final int[] inputs = new int[] { 0, 1 };
|
||||
final int[] outputs = new int[] { 2, 3 };
|
||||
this.inventory = new Inventory<>(5, "TileIndustrialBlastFurnace", 64, this).withConfiguredAccess();
|
||||
|
|
|
@ -49,7 +49,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
|
|
@ -49,7 +49,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
|
|
|
@ -35,7 +35,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
|
|
|
@ -40,8 +40,6 @@ import techreborn.init.TRContent;
|
|||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import techreborn.items.ingredients.ItemParts;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
public class TileRecycler extends TilePowerAcceptor
|
||||
|
|
|
@ -28,12 +28,12 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import reborncore.api.power.EnumPowerTier;
|
||||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import reborncore.common.registration.RebornRegister;
|
||||
import reborncore.common.registration.impl.ConfigRegistry;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.client.container.IContainerProvider;
|
||||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.tiles.storage.TileEnergyStorage;
|
||||
|
||||
|
|
|
@ -30,13 +30,13 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.api.power.EnumPowerTier;
|
||||
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||
import reborncore.client.containerBuilder.builder.ContainerBuilder;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import reborncore.common.registration.RebornRegister;
|
||||
import reborncore.common.registration.impl.ConfigRegistry;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.blocks.storage.BlockLapotronicSU;
|
||||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.tiles.storage.TileEnergyStorage;
|
||||
import reborncore.client.containerBuilder.IContainerProvider;
|
||||
|
|
Loading…
Reference in a new issue