mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 12:09:39 +00:00
Fix Greenhouse Target State NPE
This commit is contained in:
1 parent
d37a52dcf4
commit
6d3ff67efd
8 files changed
+48
-62
No files matched your search
@@ -15,7 +15,6 @@ import com.google.common.base.Preconditions;
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.File;
|
||||
|
||||
import forestry.plugins.compat.PluginNatura;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
@@ -34,6 +33,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.core.EventHandlerCore;
|
||||
import forestry.core.climate.ClimateStates;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.GameMode;
|
||||
@@ -46,6 +46,7 @@ import forestry.core.proxy.Proxies;
|
||||
import forestry.core.worldgen.WorldGenerator;
|
||||
import forestry.plugins.PluginManager;
|
||||
import forestry.plugins.compat.PluginIC2;
|
||||
import forestry.plugins.compat.PluginNatura;
|
||||
|
||||
/**
|
||||
* Forestry Minecraft Mod
|
||||
@@ -75,6 +76,7 @@ public class Forestry {
|
||||
ForestryAPI.instance = this;
|
||||
ForestryAPI.forestryConstants = new Constants();
|
||||
ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
|
||||
ForestryAPI.states = new ClimateStates();
|
||||
EnumErrorCode.init();
|
||||
FluidRegistry.enableUniversalBucket();
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
|
||||
@@ -9,16 +9,18 @@ import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IChromosome;
|
||||
import forestry.api.genetics.IFruitFamily;
|
||||
import forestry.api.genetics.ISpeciesRootPollinatable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IChromosome;
|
||||
import forestry.api.genetics.IFruitFamily;
|
||||
import forestry.api.genetics.ISpeciesRootPollinatable;
|
||||
|
||||
public interface ITreeRoot extends ISpeciesRootPollinatable {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package forestry.apiculture.items;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.apiculture.blocks.BlockHoneyComb;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemBlockHoneyComb extends ItemBlockForestry<BlockHoneyComb> implements IColoredItem {
|
||||
|
||||
|
||||
@@ -15,9 +15,17 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.arboriculture.EnumTreeChromosome;
|
||||
import forestry.api.arboriculture.IAlleleFruit;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder;
|
||||
import forestry.api.arboriculture.IFruitProvider;
|
||||
@@ -31,18 +39,11 @@ import forestry.api.arboriculture.IWoodProvider;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.IFruitFamily;
|
||||
import forestry.arboriculture.genetics.ClimateGrowthProvider;
|
||||
import forestry.arboriculture.genetics.LeafProvider;
|
||||
import forestry.core.genetics.alleles.AlleleSpecies;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesBuilder, IAlleleTreeSpecies {
|
||||
private final ITreeGenerator generator;
|
||||
|
||||
@@ -27,7 +27,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import forestry.api.climate.ClimateStateType;
|
||||
import forestry.api.climate.ClimateType;
|
||||
import forestry.api.climate.IClimateState;
|
||||
import forestry.api.climate.IClimateStates;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.greenhouse.IClimateHousing;
|
||||
import forestry.core.network.IStreamable;
|
||||
@@ -66,6 +65,7 @@ public class ClimateContainer implements IClimateContainer, IStreamable {
|
||||
this.modifierData = new NBTTagCompound();
|
||||
this.boundaryUp = ClimateState.MIN;
|
||||
this.boundaryDown = ClimateState.MIN;
|
||||
this.targetedState = AbsentClimateState.INSTANCE;
|
||||
}
|
||||
|
||||
public ClimateContainer(IClimateHousing parent, NBTTagCompound nbtTag) {
|
||||
@@ -164,9 +164,7 @@ public class ClimateContainer implements IClimateContainer, IStreamable {
|
||||
@Override
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
|
||||
state.writeToNBT(nbt);
|
||||
if(targetedState != null) {
|
||||
nbt.setTag("Target", targetedState.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
nbt.setTag("Target", targetedState.writeToNBT(new NBTTagCompound()));
|
||||
nbt.setTag("modifierData", modifierData);
|
||||
return nbt;
|
||||
}
|
||||
@@ -174,9 +172,7 @@ public class ClimateContainer implements IClimateContainer, IStreamable {
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbt) {
|
||||
state = ForestryAPI.states.create(nbt);
|
||||
if(nbt.hasKey("Target")) {
|
||||
targetedState = new ClimateState(nbt.getCompoundTag("Target"), ClimateStateType.IMMUTABLE);
|
||||
}
|
||||
targetedState = ForestryAPI.states.create(nbt.getCompoundTag("Target"));
|
||||
modifierData = nbt.getCompoundTag("modifierData");
|
||||
}
|
||||
|
||||
@@ -231,34 +227,19 @@ public class ClimateContainer implements IClimateContainer, IStreamable {
|
||||
|
||||
@Override
|
||||
public void writeData(PacketBufferForestry data) {
|
||||
data.writeFloat(state.getTemperature());
|
||||
data.writeFloat(state.getHumidity());
|
||||
data.writeFloat(boundaryUp.getTemperature());
|
||||
data.writeFloat(boundaryUp.getHumidity());
|
||||
data.writeFloat(boundaryDown.getTemperature());
|
||||
data.writeFloat(boundaryDown.getHumidity());
|
||||
if(targetedState.isPresent()) {
|
||||
data.writeBoolean(true);
|
||||
data.writeFloat(targetedState.getTemperature());
|
||||
data.writeFloat(targetedState.getHumidity());
|
||||
}else{
|
||||
data.writeBoolean(false);
|
||||
}
|
||||
data.writeClimateState(state);
|
||||
data.writeClimateState(boundaryUp);
|
||||
data.writeClimateState(boundaryDown);
|
||||
data.writeClimateState(targetedState);
|
||||
data.writeCompoundTag(modifierData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(PacketBufferForestry data) throws IOException {
|
||||
state = state.setTemperature(data.readFloat());
|
||||
state = state.setHumidity(data.readFloat());
|
||||
IClimateStates states = ForestryAPI.states;
|
||||
boundaryUp = states.create(data.readFloat(), data.readFloat(), ClimateStateType.IMMUTABLE);
|
||||
boundaryDown = states.create(data.readFloat(), data.readFloat(), ClimateStateType.IMMUTABLE);
|
||||
if(data.readBoolean()) {
|
||||
targetedState = states.create(data.readFloat(), data.readFloat(), ClimateStateType.IMMUTABLE);
|
||||
}else{
|
||||
targetedState = states.absent();
|
||||
}
|
||||
state = data.readClimateState();
|
||||
boundaryUp = data.readClimateState();
|
||||
boundaryDown = data.readClimateState();
|
||||
targetedState = data.readClimateState();
|
||||
modifierData = data.readCompoundTag();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,15 +10,16 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.inventory;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.core.tiles.EscritoireGame;
|
||||
import forestry.core.tiles.TileEscritoire;
|
||||
import forestry.core.utils.GeneticsUtil;
|
||||
import forestry.core.utils.SlotUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class InventoryEscritoire extends InventoryAdapterTile<TileEscritoire> {
|
||||
public static final short SLOT_ANALYZE = 0;
|
||||
|
||||
@@ -10,11 +10,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.farming.logic;
|
||||
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.core.network.packets.PacketFXSignal;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.NetworkUtil;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -26,6 +21,12 @@ import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.core.network.packets.PacketFXSignal;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.NetworkUtil;
|
||||
|
||||
public class FarmableSapling implements IFarmable {
|
||||
protected final ItemStack germling;
|
||||
protected final boolean ignoreMetadata;
|
||||
|
||||
@@ -15,10 +15,8 @@ import java.io.IOException;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
import forestry.api.climate.ClimateStateType;
|
||||
import forestry.api.climate.IClimateState;
|
||||
import forestry.api.multiblock.IGreenhouseComponent;
|
||||
import forestry.core.climate.ClimateState;
|
||||
import forestry.core.multiblock.MultiblockUtil;
|
||||
import forestry.core.network.ForestryPacket;
|
||||
import forestry.core.network.IForestryPacketHandlerServer;
|
||||
@@ -45,21 +43,19 @@ public class PacketSelectClimateTargeted extends ForestryPacket implements IFore
|
||||
@Override
|
||||
protected void writeData(PacketBufferForestry data) throws IOException {
|
||||
data.writeBlockPos(pos);
|
||||
data.writeFloat(climateState.getTemperature());
|
||||
data.writeFloat(climateState.getHumidity());
|
||||
data.writeClimateState(climateState);
|
||||
}
|
||||
|
||||
public static class Handler implements IForestryPacketHandlerServer {
|
||||
@Override
|
||||
public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException {
|
||||
BlockPos pos = data.readBlockPos();
|
||||
float temperature = data.readFloat();
|
||||
float humidity = data.readFloat();
|
||||
IClimateState climateState = data.readClimateState();
|
||||
|
||||
IGreenhouseControllerInternal controller = MultiblockUtil.getController(player.world, pos, IGreenhouseComponent.class);
|
||||
if (controller != null) {
|
||||
IClimateContainer container = controller.getClimateContainer();
|
||||
container.setTargetedState(new ClimateState(temperature, humidity, ClimateStateType.IMMUTABLE));
|
||||
container.setTargetedState(climateState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user