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:
commit
4440c2f305
148 changed files with 1016 additions and 5344 deletions
|
@ -32,6 +32,8 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
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.gui.builder.TRBuilder;
|
||||
import reborncore.common.network.NetworkManager;
|
||||
import techreborn.packets.PacketAutoCraftingTableLock;
|
||||
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
|
||||
|
@ -85,8 +87,8 @@ public class GuiAutoCrafting extends GuiBase {
|
|||
renderItemStack(recipe.getRecipeOutput(), 95, 42);
|
||||
}
|
||||
final Layer layer = Layer.FOREGROUND;
|
||||
this.builder.drawMultiEnergyBar(this, 9, 26, (int) this.tileAutoCraftingTable.getEnergy(), (int) this.tileAutoCraftingTable.getMaxPower(), mouseX, mouseY, 0, layer);
|
||||
this.builder.drawProgressBar(this, tileAutoCraftingTable.getProgress(), tileAutoCraftingTable.getMaxProgress(), 120, 44, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer);
|
||||
builder.drawMultiEnergyBar(this, 9, 26, (int) tileAutoCraftingTable.getEnergy(), (int) tileAutoCraftingTable.getMaxPower(), mouseX, mouseY, 0, layer);
|
||||
builder.drawProgressBar(this, tileAutoCraftingTable.getProgress(), tileAutoCraftingTable.getMaxProgress(), 120, 44, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -102,12 +104,12 @@ public class GuiAutoCrafting extends GuiBase {
|
|||
drawOutputSlot(95, 42, layer);
|
||||
drawString("Inventory", 8, 82, 4210752, layer);
|
||||
|
||||
this.builder.drawLockButton(this, 145, 4, mouseX, mouseY, layer, tileAutoCraftingTable.locked);
|
||||
builder.drawLockButton(this, 145, 4, mouseX, mouseY, layer, tileAutoCraftingTable.locked);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
|
||||
if (this.builder.isInRect(145 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)) {
|
||||
if (builder.isInRect(145 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)) {
|
||||
NetworkManager.sendToServer(new PacketAutoCraftingTableLock(tileAutoCraftingTable, !tileAutoCraftingTable.locked));
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue