From dc6af948d98339eee09ba259b22dc59f580f7498 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 21:23:50 -0600 Subject: [PATCH] Don't use a sideonly client method. Closes #18 --- .../common/block/subtile/functional/SubTileDaffomill.java | 4 +++- .../common/block/subtile/functional/SubTileHopperhock.java | 5 ++++- .../common/block/subtile/functional/SubTilePollidisiac.java | 3 ++- .../common/block/subtile/functional/SubTileRannuncarpus.java | 3 ++- .../block/subtile/functional/SubTileSpectranthemum.java | 4 +++- .../common/block/subtile/generating/SubTileEndoflame.java | 4 +++- .../common/block/subtile/generating/SubTileGourmaryllis.java | 4 +++- .../common/block/subtile/generating/SubTileSpectrolus.java | 4 +++- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 3 ++- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 5fca2e086..d3142450b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -18,11 +18,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileDaffomill extends SubTileFunctional { @@ -51,7 +53,7 @@ public class SubTileDaffomill extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); int slowdown = getSlowdownFactor(); for(EntityItem item : items) - if(!item.isDead && item.getAge() >= slowdown) { + if(!item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { item.motionX += orientation.getFrontOffsetX() * 0.05; item.motionY += orientation.getFrontOffsetY() * 0.05; item.motionZ += orientation.getFrontOffsetZ() * 0.05; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index d4422a916..565da3142 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -33,6 +33,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import scala.reflect.internal.util.WeakHashSet; @@ -43,6 +44,7 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileHopperhock extends SubTileFunctional { @@ -73,7 +75,8 @@ public class SubTileHopperhock extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.getAge() >= 105 && item.getAge() < 110 || item.isDead) + int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE); + if(age < (60 + slowdown) || age >= 105 && age < 110 || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index e2febb00d..6d78a8150 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -16,6 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -45,7 +46,7 @@ public class SubTilePollidisiac extends SubTileFunctional { int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); if(animal.getGrowingAge() == 0 && love <= 0) { for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 7522f7463..d4dd2fcb3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -31,6 +31,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFlowerPlaceable; @@ -79,7 +80,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 67f0a24a4..7270a9786 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.BlockPos; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -28,6 +29,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileSpectranthemum extends SubTileFunctional { @@ -56,7 +58,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index c25cc52a8..5aed0fe56 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -19,12 +19,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileEndoflame extends SubTileGenerating { @@ -47,7 +49,7 @@ public class SubTileEndoflame extends SubTileGenerating { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { - if(item.getAge() >= (59 + slowdown) && !item.isDead) { + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= (59 + slowdown) && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 1c22786b1..c10b54d59 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -19,10 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileGourmaryllis extends SubTileGenerating { @@ -51,7 +53,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && item.getAge() >= slowdown) { + if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { if(cooldown == 0) { if(!remote) { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 581e48e1b..0847f5b80 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -26,12 +26,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileSpectrolus extends SubTileGenerating { @@ -53,7 +55,7 @@ public class SubTileSpectrolus extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == wool && !item.isDead && item.getAge() >= slowdown) { + if(stack != null && stack.getItem() == wool && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { int meta = stack.getItemDamage(); if(meta == nextColor) { if(!remote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index d08cc8ed2..9bf47933b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -142,7 +142,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - if(item.getAge() > 100 && item.getAge() < 130 || !catalystsRegistered) + int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE) + if(age > 100 && age < 130 || !catalystsRegistered) return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {