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:
commit
7df4742784
59 changed files with 332 additions and 290 deletions
|
@ -167,9 +167,9 @@ public class BlockRubberLog extends Block {
|
|||
if (stack.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
IEnergyStorage capEnergy = null;
|
||||
ForgePowerItemManager capEnergy = null;
|
||||
if (stack.getItem() instanceof ItemElectricTreetap) {
|
||||
capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy = new ForgePowerItemManager(stack);
|
||||
}
|
||||
if ((capEnergy != null && capEnergy.getEnergyStored() > 20) || stack.getItem() instanceof ItemTreeTap) {
|
||||
if (state.getValue(HAS_SAP) && state.getValue(SAP_SIDE) == side) {
|
||||
|
@ -180,6 +180,8 @@ public class BlockRubberLog extends Block {
|
|||
if (!worldIn.isRemote) {
|
||||
if (capEnergy != null) {
|
||||
capEnergy.extractEnergy(20, false);
|
||||
|
||||
ExternalPowerSystems.requestEnergyFromArmor(capEnergy, playerIn);
|
||||
} else {
|
||||
playerIn.getHeldItem(EnumHand.MAIN_HAND).damageItem(1, playerIn);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue