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
|
@ -34,18 +34,20 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.registration.RebornRegister;
|
||||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.api.Reference;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
|
@ -71,7 +73,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
|||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
|
||||
IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
IEnergyStorage capEnergy = new ForgePowerItemManager(stack);
|
||||
if (capEnergy != null && capEnergy.getEnergyStored() >= usage) {
|
||||
capEnergy.extractEnergy(usage, false);
|
||||
player.setInvisible(true);
|
||||
|
@ -88,10 +90,10 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack uncharged = new ItemStack(this);
|
||||
// ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
ItemStack uncharged = new ItemStack(TRContent.CLOAKING_DEVICE);
|
||||
ItemStack charged = new ItemStack(TRContent.CLOAKING_DEVICE);
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
itemList.add(uncharged);
|
||||
// itemList.add(charged);
|
||||
}
|
||||
|
@ -114,7 +116,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
|||
@Override
|
||||
@Nullable
|
||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||
return new PoweredItemCapabilityProvider(stack);
|
||||
return new PoweredItemContainerProvider(stack);
|
||||
}
|
||||
|
||||
// IEnergyItemInfo
|
||||
|
|
|
@ -38,9 +38,12 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo {
|
||||
|
@ -61,12 +64,12 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack uncharged = new ItemStack(this);
|
||||
// ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORBPACK);
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
ItemStack uncharged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK);
|
||||
ItemStack charged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK);
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
itemList.add(uncharged);
|
||||
// itemList.add(charged);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -94,7 +97,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
|
|||
public ICapabilityProvider initCapabilities(ItemStack stack,
|
||||
@Nullable
|
||||
NBTTagCompound nbt) {
|
||||
return new PoweredItemCapabilityProvider(stack);
|
||||
return new PoweredItemContainerProvider(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,15 +34,17 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.ExternalPowerSystems;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo {
|
||||
|
@ -60,19 +62,12 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo
|
|||
if (world.isRemote) {
|
||||
return;
|
||||
}
|
||||
if (!itemStack.hasCapability(CapabilityEnergy.ENERGY, null)) {
|
||||
return;
|
||||
}
|
||||
IEnergyStorage capEnergy = itemStack.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(itemStack);
|
||||
|
||||
for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
|
||||
if (!player.inventory.getStackInSlot(i).isEmpty()) {
|
||||
ItemStack item = player.inventory.getStackInSlot(i);
|
||||
if (!item.hasCapability(CapabilityEnergy.ENERGY, null)) {
|
||||
continue;
|
||||
}
|
||||
IEnergyStorage itemPower = item.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.extractEnergy(itemPower.receiveEnergy(Math.min(capEnergy.getEnergyStored(), maxSend), false), false);
|
||||
ExternalPowerSystems.chargeItem(capEnergy, player.inventory.getStackInSlot(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -103,7 +98,7 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo
|
|||
public ICapabilityProvider initCapabilities(ItemStack stack,
|
||||
@Nullable
|
||||
NBTTagCompound nbt) {
|
||||
return new PoweredItemCapabilityProvider(stack);
|
||||
return new PoweredItemContainerProvider(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -118,10 +113,10 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack uncharged = new ItemStack(this);
|
||||
// ItemStack charged = new ItemStack(ModItems.LITHIUM_ION_BATPACK);
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
ItemStack uncharged = new ItemStack(TRContent.LITHIUM_ION_BATTERY);
|
||||
ItemStack charged = new ItemStack(TRContent.LITHIUM_ION_BATTERY);
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
itemList.add(uncharged);
|
||||
// itemList.add(charged);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue