diff --git a/build.properties b/build.properties index d41133ced..7532b1f87 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ -minecraft_version=1.9.4 +minecraft_version=1.10.2 mappings_version=snapshot_20160523 -forge_version=12.17.0.1976 +forge_version=12.18.1.2014-1.10.2 mcmp_version=1.2.0_72 -jei_version=3.4.0.204 +jei_version=3.7.6.231 mod_version=9.1.0 diff --git a/src/api/java/buildcraft/api/core/EnumPipePart.java b/src/api/java/buildcraft/api/core/EnumPipePart.java index fbdc058d5..a805d3ef6 100755 --- a/src/api/java/buildcraft/api/core/EnumPipePart.java +++ b/src/api/java/buildcraft/api/core/EnumPipePart.java @@ -1,17 +1,17 @@ package buildcraft.api.core; +import io.netty.buffer.ByteBuf; + import java.util.Locale; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTBase.NBTPrimitive; +import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import io.netty.buffer.ByteBuf; +import com.google.common.collect.Maps; public enum EnumPipePart implements IStringSerializable, INetworkLoadable_BC8 { DOWN(EnumFacing.DOWN), @@ -100,7 +100,7 @@ public enum EnumPipePart implements IStringSerializable, INetworkLoadable_BC8 6) return CENTER; return values()[ord]; } diff --git a/src/api/java/ic2/api/reactor/IReactor.class b/src/api/java/ic2/api/reactor/IReactor.class index 6f62b5b2c..f711174e2 100644 Binary files a/src/api/java/ic2/api/reactor/IReactor.class and b/src/api/java/ic2/api/reactor/IReactor.class differ diff --git a/src/api/java/ic2/api/reactor/IReactor.java b/src/api/java/ic2/api/reactor/IReactor.java index 0c43add16..7f2cefc93 100644 --- a/src/api/java/ic2/api/reactor/IReactor.java +++ b/src/api/java/ic2/api/reactor/IReactor.java @@ -2,18 +2,40 @@ package ic2.api.reactor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; /** - * Interface implemented by the tile entity of nuclear reactors. + * Interface implemented nuclear reactors, expected to be a {@link TileEntity}, but does not have to be. */ public interface IReactor { /** * Return the tile entity representing the reactor core. + *
+ * If null, {@link #getReactorWorld()} and {@link #getReactorPos()} can still be used if it's world and/or position are desired. * * @return the reactor core's TE or null. */ public TileEntity getCoreTe(); + /** + * Return the reactor's current world instance (it's position can be acquired using {@link #getReactorPos()}. + *
+ * Should be the same world as {@link #getCoreTe()} returns if it's not null. + * + * @return The reactor's world object + */ + public World getReactorWorld(); //getWorld has obfuscation issues (https://github.com/md-5/SpecialSource/issues/12) + + /** + * Return the reactor's current position in the world ({@link #getReactorWorld()}. + *
+ * Should be the same position as {@link #getCoreTe()} returns if it's not null. + * + * @return The reactor's current position + */ + public BlockPos getReactorPos(); //As would getPos + /** * Get the reactor's heat. * diff --git a/src/api/java/ic2/api/reactor/IReactorChamber.class b/src/api/java/ic2/api/reactor/IReactorChamber.class new file mode 100644 index 000000000..4fe583e52 Binary files /dev/null and b/src/api/java/ic2/api/reactor/IReactorChamber.class differ diff --git a/src/api/java/ic2/api/reactor/IReactorChamber.java b/src/api/java/ic2/api/reactor/IReactorChamber.java new file mode 100644 index 000000000..e0fb5d1c2 --- /dev/null +++ b/src/api/java/ic2/api/reactor/IReactorChamber.java @@ -0,0 +1,22 @@ +package ic2.api.reactor; + +/** + * Interface implemented nuclear reactor chambers + */ +public interface IReactorChamber { + /** + * Return the {@link IReactor} this chamber is for + * + * @return The reactor + */ + public IReactor getReactorInstance(); + + /** + * Returns true if the chamber is a reactor wall opposed to an actual chamber of items + *
+ * eg: {@link TileEntityReactorChamberElectric} returns false, but {@link TileEntityReactorVessel} returns true + * + * @return If the chamber is a wall or not + */ + public boolean isWall(); +} \ No newline at end of file diff --git a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java index cc832e61a..3c05ed758 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java +++ b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java @@ -1,20 +1,21 @@ package ic2.api.recipe; -import ic2.api.item.IC2Items; - import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import ic2.api.item.IC2Items; + public class RecipeInputFluidContainer implements IRecipeInput { public RecipeInputFluidContainer(Fluid fluid) { - this(fluid, FluidContainerRegistry.BUCKET_VOLUME); + this(fluid, Fluid.BUCKET_VOLUME); } public RecipeInputFluidContainer(Fluid fluid, int amount) { diff --git a/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java index 93e7c0074..ce3918257 100644 --- a/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java @@ -30,4 +30,10 @@ public class ShapedMekanismRecipeHandler implements IRecipeHandler im { return recipe.category == category; } + + @Override + public String getRecipeCategoryUid(@Nonnull T recipe) + { + return category.getUid(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java index a6431580a..5788e452a 100644 --- a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java @@ -43,4 +43,10 @@ public class MachineRecipeHandler implements IRe { return recipe.category == category; } + + @Override + public String getRecipeCategoryUid(@Nonnull T recipe) + { + return category.getUid(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java index 7b9c69531..fd518981b 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java @@ -39,4 +39,10 @@ public class ChemicalCrystallizerRecipeHandler implements IRecipeHandler { return recipe.category == category; } + + @Override + public String getRecipeCategoryUid(@Nonnull PRCRecipeWrapper recipe) + { + return category.getUid(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java index 45d9f3dc8..74e16658d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -39,4 +39,10 @@ public class RotaryCondensentratorRecipeHandler implements IRecipeHandler entities = source.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, coord.offset(side).getBoundingBox()); boolean latched = false;