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:
modmuss50 2019-01-07 22:58:42 +00:00
commit 7df4742784
59 changed files with 332 additions and 290 deletions

View file

@ -32,12 +32,12 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.energy.CapabilityEnergy;
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 javax.annotation.Nullable;
@ -56,12 +56,8 @@ public class ItemBattery extends Item implements IEnergyItemInfo {
this.addPropertyOverride(new ResourceLocation("techreborn:empty"), new IItemPropertyGetter() {
@Override
@SideOnly(Side.CLIENT)
public float apply(ItemStack stack,
@Nullable
World worldIn,
@Nullable
EntityLivingBase entityIn) {
if (!stack.isEmpty() && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() == 0) {
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
if (!stack.isEmpty() && new ForgePowerItemManager(stack).getEnergyStored() == 0) {
return 1.0F;
}
return 0.0F;
@ -90,7 +86,7 @@ public class ItemBattery extends Item implements IEnergyItemInfo {
public ICapabilityProvider initCapabilities(ItemStack stack,
@Nullable
NBTTagCompound nbt) {
return new PoweredItemCapabilityProvider(stack);
return new PoweredItemContainerProvider(stack);
}
// IEnergyItemInfo

View file

@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -46,11 +47,11 @@ public class ItemEnergyCrystal extends ItemBattery {
return;
}
ItemStack stack = new ItemStack(TRContent.ENERGY_CRYSTAL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack charged = stack.copy();
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
itemList.add(stack);
// itemList.add(charged);
itemList.add(charged);
}
}

View file

@ -29,7 +29,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
public class ItemLapotronCrystal extends ItemBattery {
@ -44,12 +46,12 @@ public class ItemLapotronCrystal extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack stack = new ItemStack(TRContent.LAPOTRON_CRYSTAL);
ItemStack charged = stack.copy();
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
itemList.add(stack);
// itemList.add(charged);
itemList.add(charged);
}
}

View file

@ -29,7 +29,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
public class ItemLapotronicOrb extends ItemBattery {
@ -44,12 +46,12 @@ public class ItemLapotronicOrb extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack stack = new ItemStack(TRContent.LAPOTRONIC_ORB);
ItemStack charged = stack.copy();
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
itemList.add(stack);
// itemList.add(charged);
itemList.add(charged);
}
}

View file

@ -29,6 +29,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.init.TRContent;
public class ItemLithiumIonBattery extends ItemBattery {
@ -43,13 +45,13 @@ public class ItemLithiumIonBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack stack = new ItemStack(TRContent.LITHIUM_ION_BATTERY);
ItemStack charged = stack.copy();
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
itemList.add(stack);
//itemList.add(charged);
itemList.add(charged);
}
}

View file

@ -29,6 +29,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.init.TRContent;
public class ItemRedCellBattery extends ItemBattery {
@ -43,12 +45,12 @@ public class ItemRedCellBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack stack = new ItemStack(TRContent.LITHIUM_ION_BATTERY);
ItemStack charged = stack.copy();
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
itemList.add(stack);
//itemList.add(charged);
itemList.add(charged);
}
}