mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 12:09:39 +00:00
Update for 1.11. Missing assets, unstable.
This commit is contained in:
1 parent
30d7365518
commit
9611ae08ae
1145 files changed
+15561
-18107
No files matched your search
@@ -5,8 +5,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.multiblock;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.arboriculture.EnumPileType;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
@@ -19,22 +17,21 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
* They are automatically detected and handled by the charcoal pile when they join its structure.
|
||||
*/
|
||||
public interface ICharcoalPileComponent<T extends IMultiblockLogicCharcoalPile> extends IMultiblockComponent {
|
||||
|
||||
|
||||
@Override
|
||||
T getMultiblockLogic();
|
||||
|
||||
IAlleleTreeSpecies getTreeSpecies();
|
||||
|
||||
void setTreeSpecies(@Nonnull IAlleleTreeSpecies treeSpecies);
|
||||
|
||||
void setTreeSpecies(IAlleleTreeSpecies treeSpecies);
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
GameProfile getOwner();
|
||||
|
||||
void setOwner(@Nonnull GameProfile owner);
|
||||
|
||||
|
||||
void setOwner(GameProfile owner);
|
||||
|
||||
EnumPileType getPileType();
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
IAlleleTreeSpecies getNextWoodPile();
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import forestry.api.climate.IClimatiserDefinition;
|
||||
import forestry.api.greenhouse.IGreenhouseListener;
|
||||
import forestry.api.lepidopterology.IButterflyCocoon;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
public interface IGreenhouseComponent<T extends IMultiblockLogicGreenhouse> extends IMultiblockComponent {
|
||||
@Override
|
||||
@@ -35,7 +36,7 @@ public interface IGreenhouseComponent<T extends IMultiblockLogicGreenhouse> exte
|
||||
}
|
||||
|
||||
interface ButterflyHatch extends IGreenhouseComponent {
|
||||
ItemStack[] addCocoonLoot(IButterflyCocoon cocoon);
|
||||
NonNullList<ItemStack> addCocoonLoot(IButterflyCocoon cocoon);
|
||||
}
|
||||
|
||||
interface Active extends IGreenhouseComponent {
|
||||
|
||||
@@ -7,7 +7,6 @@ package forestry.api.multiblock;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import forestry.api.climate.IClimateControl;
|
||||
@@ -34,7 +33,6 @@ public interface IGreenhouseController extends IMultiblockController, IGreenhous
|
||||
IClimateRegion getRegion();
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
IClimateControl getClimateControl();
|
||||
|
||||
}
|
||||
@@ -5,6 +5,8 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.multiblock;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
@@ -24,6 +26,7 @@ public interface IMultiblockComponent {
|
||||
/**
|
||||
* @return the gameProfile of the player who owns this single component (not the entire multiblock)
|
||||
*/
|
||||
@Nullable
|
||||
GameProfile getOwner();
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.multiblock;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
@@ -31,11 +31,11 @@ public interface IMultiblockController {
|
||||
* @return A string representing the last error encountered when trying to assemble this
|
||||
* multiblock, or null if there is no error.
|
||||
*/
|
||||
@Nullable
|
||||
String getLastValidationError();
|
||||
|
||||
/**
|
||||
* @return all the multiblock components attached to this controller
|
||||
*/
|
||||
@Nonnull
|
||||
Collection<IMultiblockComponent> getComponents();
|
||||
}
|
||||
@@ -5,8 +5,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.multiblock;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
|
||||
@@ -46,8 +44,7 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
|
||||
super.readFromNBT(data);
|
||||
multiblockLogic.readFromNBT(data);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@Override
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound data) {
|
||||
data = super.writeToNBT(data);
|
||||
@@ -58,30 +55,28 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
|
||||
@Override
|
||||
public final void invalidate() {
|
||||
super.invalidate();
|
||||
multiblockLogic.invalidate(worldObj, this);
|
||||
multiblockLogic.invalidate(world, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void onChunkUnload() {
|
||||
super.onChunkUnload();
|
||||
multiblockLogic.onChunkUnload(worldObj, this);
|
||||
multiblockLogic.onChunkUnload(world, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void validate() {
|
||||
super.validate();
|
||||
multiblockLogic.validate(worldObj, this);
|
||||
multiblockLogic.validate(world, this);
|
||||
}
|
||||
|
||||
/* Network Communication */
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public SPacketUpdateTileEntity getUpdatePacket() {
|
||||
return new SPacketUpdateTileEntity(getPos(), 0, getUpdateTag());
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public NBTTagCompound getUpdateTag() {
|
||||
NBTTagCompound updateTag = super.getUpdateTag();
|
||||
@@ -99,7 +94,7 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleUpdateTag(@Nonnull NBTTagCompound tag) {
|
||||
public void handleUpdateTag(NBTTagCompound tag) {
|
||||
super.handleUpdateTag(tag);
|
||||
multiblockLogic.decodeDescriptionPacket(tag);
|
||||
this.decodeDescriptionPacket(tag);
|
||||
|
||||
@@ -3,7 +3,12 @@
|
||||
*
|
||||
* This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
|
||||
******************************************************************************/
|
||||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
@API(apiVersion = "3.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|multiblock")
|
||||
package forestry.api.multiblock;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import net.minecraftforge.fml.common.API;
|
||||
Reference in new issue
Block a user