diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 5bcae8da1..31e4b032a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -34,6 +34,7 @@ import java.util.Queue; public class FXSparkle extends Particle { + private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); private static final Queue queuedRenders = new ArrayDeque<>(); @@ -73,7 +74,7 @@ public class FXSparkle extends Particle { ParticleRenderDispatcher.fakeSparkleFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index a9ae72ac2..1ca8d4faa 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -32,6 +32,7 @@ import java.util.Queue; public class FXWisp extends Particle { + private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final Queue queuedRenders = new ArrayDeque<>(); @@ -81,7 +82,7 @@ public class FXWisp extends Particle { ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); if(!queuedRenders.isEmpty()) { tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); 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 d96a04095..49d189e0f 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 @@ -43,8 +43,7 @@ public class SubTilePollidisiac extends SubTileFunctional { if(mana < manaCost) break; - int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); - if(animal.getGrowingAge() == 0 && love <= 0) { + if(animal.getGrowingAge() == 0 && !animal.isInLove()) { for(EntityItem item : items) { int age; try { diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 7dcb2ed22..6947941c4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -24,9 +24,6 @@ public final class LibObfuscation { public static final String[] AGE = { "age", "field_70292_b", "d" }; public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "e" }; - // ParticleManager - public static final String[] PARTICLE_TEXTURES = { "particleTextures", "field_110737_b", "b" }; - // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = { "targetClass", "field_75307_b", "a" }; public static final String[] TARGET_ENTITY_SELECTOR = { "targetEntitySelector", "field_82643_g", "c" }; @@ -50,10 +47,10 @@ public final class LibObfuscation { public static final String[] ITEM_IN_USE_COUNT = { "activeItemStackUseCount", "field_184628_bn", "bn" }; // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = { "horseJumpStrength", "field_110271_bv", "bC" }; + public static final String[] HORSE_JUMP_STRENGTH = { "JUMP_STRENGTH", "field_110271_bv", "bC" }; // PlayerControllerMP - public static final String[] NET_CLIENT_HANDLER = { "netClientHandler", "field_78774_b", "b" }; + public static final String[] NET_CLIENT_HANDLER = { "connection", "field_78774_b", "b" }; // MobSpawnerBaseLogic public static final String[] IS_ACTIVATED = { "isActivated" ,"func_98279_f", "h" }; @@ -74,9 +71,6 @@ public final class LibObfuscation { // EntityThrowable public static final String[] THROWER = { "thrower", "field_70192_c", "h" }; - // GuiContainer - public static final String[] THE_SLOT = { "theSlot", "field_147006_u", "u" }; - // GuiChat public static final String[] INPUT_FIELD = { "inputField", "field_146415_a", "a" }; public static final String[] COMPLETE_FLAG = { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9