diff --git a/src/main/java/com/infinityraider/agricraft/api/v1/crop/IAgriCrop.java b/src/main/java/com/infinityraider/agricraft/api/v1/crop/IAgriCrop.java index 270118902..e3f4b9f7f 100644 --- a/src/main/java/com/infinityraider/agricraft/api/v1/crop/IAgriCrop.java +++ b/src/main/java/com/infinityraider/agricraft/api/v1/crop/IAgriCrop.java @@ -24,17 +24,21 @@ public interface IAgriCrop extends IAgriSeedProvider, IAgriSeedAcceptor, IAgriFe /** * Retrieves the location of the crop instance. + * Implementors can just call getPos() if possible. Renamed because of ForgeGradle obfuscation bug. + * https://github.com/MinecraftForge/ForgeGradle/issues/205 * * @return the crop's position. */ - BlockPos getPos(); + BlockPos getPosDeobf(); /** * Retrieves the world that the crop is in. + * Implementors can just call getWorld() if possible. Renamed because of ForgeGradle obfuscation bug. + * https://github.com/MinecraftForge/ForgeGradle/issues/205 * * @return The world in which the crop is located. */ - World getWorld(); + World getWorldDeobf(); /** * @return The growth stage of the crop, between 0 and 7 (both inclusive). diff --git a/src/main/java/com/infinityraider/agricraft/farming/mutation/MutateStrategy.java b/src/main/java/com/infinityraider/agricraft/farming/mutation/MutateStrategy.java index 17bde33b5..744982e5b 100644 --- a/src/main/java/com/infinityraider/agricraft/farming/mutation/MutateStrategy.java +++ b/src/main/java/com/infinityraider/agricraft/farming/mutation/MutateStrategy.java @@ -29,7 +29,7 @@ public Optional executeStrategy(IAgriCrop crop, Random rand) { Objects.requireNonNull(rand, "The random passed to a mutation strategy should not be null!"); // Fetch all neighboring crop instances. - final List neighbors = WorldHelper.getTileNeighbors(crop.getWorld(), crop.getPos(), IAgriCrop.class); + final List neighbors = WorldHelper.getTileNeighbors(crop.getWorldDeobf(), crop.getPosDeobf(), IAgriCrop.class); // Determine all possible parents. final List parents = neighbors.stream() diff --git a/src/main/java/com/infinityraider/agricraft/farming/mutation/SpreadStrategy.java b/src/main/java/com/infinityraider/agricraft/farming/mutation/SpreadStrategy.java index be2330167..bc3af1460 100644 --- a/src/main/java/com/infinityraider/agricraft/farming/mutation/SpreadStrategy.java +++ b/src/main/java/com/infinityraider/agricraft/farming/mutation/SpreadStrategy.java @@ -24,7 +24,7 @@ public double getRollChance() { @Override public Optional executeStrategy(IAgriCrop crop, Random rand) { - List matureNeighbours = WorldHelper.getTileNeighbors(crop.getWorld(), crop.getPos(), IAgriCrop.class); + List matureNeighbours = WorldHelper.getTileNeighbors(crop.getWorldDeobf(), crop.getPosDeobf(), IAgriCrop.class); matureNeighbours.removeIf(c -> !c.isMature()); if (!matureNeighbours.isEmpty()) { int index = rand.nextInt(matureNeighbours.size()); diff --git a/src/main/java/com/infinityraider/agricraft/tiles/TileEntityCrop.java b/src/main/java/com/infinityraider/agricraft/tiles/TileEntityCrop.java index 2df9cae8c..f856741b5 100644 --- a/src/main/java/com/infinityraider/agricraft/tiles/TileEntityCrop.java +++ b/src/main/java/com/infinityraider/agricraft/tiles/TileEntityCrop.java @@ -31,6 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -199,6 +201,23 @@ public boolean setSeed(AgriSeed seed) { // // ========================================================================= // ========================================================================= + // IAgriCrop Methods + // + // ========================================================================= + + public BlockPos getPosDeobf() { + return this.getPos(); + } + + public World getWorldDeobf() { + return this.getWorld(); + } + + // ========================================================================= + // IAgriCrop Methods + // + // ========================================================================= + // ========================================================================= // Misc. // ========================================================================= @Override