First steps porting to 1.9

This commit is contained in:
mezz committed 2016-05-03 00:26:28 -07:00
1 parent c47acd803c
commit 73c2608848
635 files changed
+2309 -10906

No files matched your search

@@ -7,7 +7,7 @@ package forestry.api.apiculture;
import java.util.Map;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.apiculture;
import net.minecraft.util.Vec3;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@@ -54,5 +54,5 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
* @since Forestry 4.2
* @return exact coordinates where bee FX should spawn from
*/
Vec3 getBeeFXCoordinates();
Vec3d getBeeFXCoordinates();
}
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.apiculture;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraftforge.fml.relauncher.Side;
@@ -7,7 +7,7 @@ package forestry.api.apiculture;
import java.util.ArrayList;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IBeekeepingMode {
@@ -8,7 +8,7 @@ package forestry.api.apiculture;
import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
/**
@@ -1,7 +1,7 @@
package forestry.api.apiculture;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IHiveTile {
@@ -6,7 +6,7 @@
package forestry.api.apiculture.hives;
import net.minecraft.block.Block;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.apiculture.hives;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IHiveGen {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IFruitFamily;
@@ -37,12 +37,12 @@ public enum EnumFruitFamily implements IFruitFamily {
@Override
public String getName() {
return StatCollector.translateToLocal("for.family." + uid);
return I18n.translateToLocal("for.family." + uid);
}
@Override
public String getDescription() {
return StatCollector.translateToLocal("for.family." + uid + ".description");
return I18n.translateToLocal("for.family." + uid + ".description");
}
}
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.genetics.IAlleleEffect;
@@ -8,7 +8,7 @@ package forestry.api.arboriculture;
import javax.annotation.Nonnull;
import java.util.Collection;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraftforge.common.EnumPlantType;
@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -7,7 +7,7 @@ package forestry.api.arboriculture;
import javax.annotation.Nonnull;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import forestry.api.core.IModelManager;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IGrowthProvider {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface ILeafTickHandler {
@@ -7,7 +7,7 @@ package forestry.api.arboriculture;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IToolGrafter {
@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.arboriculture;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.genetics.IMutation;
@@ -11,7 +11,7 @@ import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
@@ -6,7 +6,7 @@
package forestry.api.core;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.core;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface ICamouflageHandler{
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.core;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface ICamouflagedBlock {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.core;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IClimateManager {
@@ -9,9 +9,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -33,17 +34,7 @@ public interface IModelBaker {
void addBakedModel(@Nonnull IBakedModel model);
void addFaceXNeg(@Nonnull TextureAtlasSprite sprite);
void addFaceYNeg(@Nonnull TextureAtlasSprite sprite);
void addFaceZNeg(@Nonnull TextureAtlasSprite sprite);
void addFaceYPos(@Nonnull TextureAtlasSprite sprite);
void addFaceZPos(@Nonnull TextureAtlasSprite sprite);
void addFaceXPos(@Nonnull TextureAtlasSprite sprite);
void addFace(@Nonnull EnumFacing facing, @Nonnull TextureAtlasSprite sprite);
void setParticleSprite(@Nullable TextureAtlasSprite particleSprite);
@@ -5,14 +5,15 @@
******************************************************************************/
package forestry.api.core;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraftforge.client.model.IFlexibleBakedModel;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public interface IModelBakerModel extends IFlexibleBakedModel {
public interface IModelBakerModel extends IBakedModel {
void setGui3d(boolean gui3d);
@@ -20,7 +21,7 @@ public interface IModelBakerModel extends IFlexibleBakedModel {
void setParticleSprite(TextureAtlasSprite particleSprite);
void setFormat(VertexFormat formate);
// void setFormat(VertexFormat formate);
void setRotation(float[] rotation);
@@ -6,7 +6,7 @@
package forestry.api.core;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
@@ -8,7 +8,7 @@ package forestry.api.farming;
import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
/**
* Easily extendable default farmListener.
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.farming;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
@@ -8,7 +8,7 @@ package forestry.api.farming;
import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
public interface IFarmListener {
@@ -8,7 +8,7 @@ package forestry.api.farming;
import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
@@ -7,7 +7,7 @@ package forestry.api.farming;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.genetics;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IFlowerAcceptableRule {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.genetics;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IFlowerGrowthHelper {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.genetics;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
@@ -6,7 +6,7 @@
package forestry.api.genetics;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IFlowerProvider {
@@ -6,7 +6,7 @@
package forestry.api.genetics;
import net.minecraft.block.Block;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.apiculture.IBee;
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.genetics;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
/**
* Any housing, hatchery or nest with a location in the world.
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.genetics;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IMutationCondition {
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.greenhouse;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IGreenhouseHelper {
@@ -9,7 +9,7 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IInternalBlock {
@@ -7,7 +7,7 @@ package forestry.api.greenhouse;
import javax.annotation.Nonnull;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
public interface IInternalBlockFace {
@@ -13,7 +13,7 @@ package forestry.api.lepidopterology;
import java.util.Map;
import forestry.api.genetics.IAlleleProperty;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.ItemStack;
public interface IAlleleButterflyCocoon extends IAlleleProperty<IAlleleButterflyCocoon> {
@@ -7,7 +7,7 @@ package forestry.api.mail;
import javax.annotation.Nonnull;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
public enum EnumTradeStationState implements IPostalState {
OK("for.chat.mail.ok"),
@@ -30,6 +30,6 @@ public enum EnumTradeStationState implements IPostalState {
@Override
public String getDescription() {
return StatCollector.translateToLocal(unlocalizedDescription);
return I18n.translateToLocal(unlocalizedDescription);
}
}
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.multiblock;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import com.mojang.authlib.GameProfile;
@@ -8,9 +8,9 @@ package forestry.api.multiblock;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
/**
* Base logic class for Multiblock-connected tile entities.
@@ -77,11 +77,11 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
NBTTagCompound packetData = new NBTTagCompound();
multiblockLogic.encodeDescriptionPacket(packetData);
this.encodeDescriptionPacket(packetData);
return new S35PacketUpdateTileEntity(getPos(), 0, packetData);
return new SPacketUpdateTileEntity(getPos(), 0, packetData);
}
@Override
public final void onDataPacket(NetworkManager network, S35PacketUpdateTileEntity packet) {
public final void onDataPacket(NetworkManager network, SPacketUpdateTileEntity packet) {
NBTTagCompound nbtData = packet.getNbtCompound();
multiblockLogic.decodeDescriptionPacket(nbtData);
this.decodeDescriptionPacket(nbtData);
@@ -5,7 +5,7 @@
******************************************************************************/
package forestry.api.world;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;