Fix touching client classes in methodhandles. Closes #129

This commit is contained in:
Vincent Lee committed 2016-02-21 17:03:28 -06:00
1 parent d7d4440b0e
commit 9b3579fe56
22 files changed
+130 -110

No files matched your search

@@ -34,7 +34,6 @@ import vazkii.botania.api.item.IWireframeCoordinateListProvider;
import vazkii.botania.api.wand.ICoordBoundItem;
import vazkii.botania.api.wand.IWireframeAABBProvider;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
public final class BoundTileRenderer {
@@ -100,9 +99,9 @@ public final class BoundTileRenderer {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return;
}
@@ -0,0 +1,38 @@
package vazkii.botania.client.core.handler;
import com.google.common.base.Throwables;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import vazkii.botania.common.lib.LibObfuscation;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
public final class ClientMethodHandles {
public static final MethodHandle
renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager
static {
try {
Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX);
f.setAccessible(true);
renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY);
f.setAccessible(true);
renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ);
f.setAccessible(true);
renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f);
} catch (IllegalAccessException e) {
FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!");
throw Throwables.propagate(e);
}
}
private ClientMethodHandles() {}
}
@@ -33,7 +33,6 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
public final class MultiblockRenderHandler {
@@ -142,9 +141,9 @@ public final class MultiblockRenderHandler {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return true;
}
@@ -25,7 +25,6 @@ import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
import vazkii.botania.common.block.tile.string.TileRedString;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
@@ -70,9 +69,9 @@ public final class RedStringRenderer {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return;
}
@@ -29,7 +29,6 @@ import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.item.ItemTwigWand;
import vazkii.botania.common.item.ModItems;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -86,9 +85,9 @@ public final class SubTileRadiusRenderHandler {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return;
}
@@ -131,9 +130,9 @@ public final class SubTileRadiusRenderHandler {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return;
}
@@ -47,7 +47,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.ModelCrystalCube;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import java.util.concurrent.TimeUnit;
@@ -65,7 +65,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));
try {
BotaniaMethodHandles.itemAge_setter.invokeExact(entity, ClientTickHandler.ticksInGame);
MethodHandles.itemAge_setter.invokeExact(entity, ClientTickHandler.ticksInGame);
} catch (Throwable ignored) {}
stack = cube.getRequestTarget();
@@ -27,7 +27,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.handler.MiscellaneousIcons;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.block.tile.TileEnchanter;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter> {
@@ -49,7 +49,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
item = new EntityItem(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant);
try {
BotaniaMethodHandles.itemAge_setter.invokeExact(item, ClientTickHandler.ticksInGame);
MethodHandles.itemAge_setter.invokeExact(item, ClientTickHandler.ticksInGame);
} catch (Throwable ignored) {}
item.setEntityItemStack(enchanter.itemToEnchant);
@@ -22,7 +22,7 @@ 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.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lexicon.LexiconData;
public class SubTileDaffomill extends SubTileFunctional {
@@ -54,7 +54,7 @@ public class SubTileDaffomill extends SubTileFunctional {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -39,7 +39,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
@@ -75,7 +75,7 @@ public class SubTileHopperhock extends SubTileFunctional {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -19,7 +19,7 @@ import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
@@ -48,7 +48,7 @@ public class SubTilePollidisiac extends SubTileFunctional {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -40,7 +40,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.LexiconData;
@@ -82,7 +82,7 @@ public class SubTileRannuncarpus extends SubTileFunctional {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lexicon.LexiconData;
import net.minecraftforge.fml.relauncher.Side;
@@ -58,7 +58,7 @@ public class SubTileSpectranthemum extends SubTileFunctional {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lexicon.LexiconData;
public class SubTileEndoflame extends SubTileGenerating {
@@ -49,7 +49,7 @@ public class SubTileEndoflame extends SubTileGenerating {
for(EntityItem item : items) {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -23,7 +23,7 @@ import net.minecraft.world.WorldServer;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lexicon.LexiconData;
public class SubTileGourmaryllis extends SubTileGenerating {
@@ -58,7 +58,7 @@ public class SubTileGourmaryllis extends SubTileGenerating {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -30,7 +30,7 @@ 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.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lexicon.LexiconData;
public class SubTileSpectrolus extends SubTileGenerating {
@@ -56,7 +56,7 @@ public class SubTileSpectrolus extends SubTileGenerating {
int age;
try {
age = (int) BotaniaMethodHandles.itemAge_getter.invokeExact(item);
age = (int) MethodHandles.itemAge_getter.invokeExact(item);
} catch (Throwable t) {
continue;
}
@@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.lib.LibBlockNames;
public class TileOpenCrate extends TileSimpleInventory {
@@ -72,7 +72,7 @@ public class TileOpenCrate extends TileSimpleInventory {
if(redstone) {
try {
BotaniaMethodHandles.itemAge_setter.invokeExact(item, -200);
MethodHandles.itemAge_setter.invokeExact(item, -200);
} catch (Throwable ignored) {}
}
@@ -10,9 +10,6 @@
*/
package vazkii.botania.common.block.tile;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import net.minecraft.entity.Entity;
@@ -26,7 +23,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.WeightedRandom;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
public class TileSpawnerClaw extends TileMod implements IManaReceiver {
@@ -43,26 +40,26 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver {
try {
// Directly drawn from MobSpawnerBaseLogic, with inverted isActivated check and mana consumption
if(!((boolean) BotaniaMethodHandles.isActivated.invokeExact(logic))) {
if(!((boolean) MethodHandles.isActivated.invokeExact(logic))) {
if(!worldObj.isRemote)
mana -= 6;
if(logic.getSpawnerWorld().isRemote) {
int delay = ((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic));
int delay = ((int) MethodHandles.spawnDelay_getter.invokeExact(logic));
if(delay > 0)
BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1);
MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1);
if(Math.random() > 0.5)
Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F);
BotaniaMethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation());
BotaniaMethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D);
MethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation());
MethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D);
} else {
if(((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) == -1)
if(((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) == -1)
resetTimer(logic);
int delay = ((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic));
int delay = ((int) MethodHandles.spawnDelay_getter.invokeExact(logic));
if(delay > 0) {
BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1);
MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1);
return;
}
@@ -71,12 +68,12 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver {
boolean flag = false;
int spawnCount = ((int) BotaniaMethodHandles.spawnCount_getter.invokeExact(logic));
int spawnRange = ((int) BotaniaMethodHandles.spawnRange_getter.invokeExact(logic));
int maxNearbyEntities = ((int) BotaniaMethodHandles.maxNearbyEntities_getter.invokeExact(logic));
int spawnCount = ((int) MethodHandles.spawnCount_getter.invokeExact(logic));
int spawnRange = ((int) MethodHandles.spawnRange_getter.invokeExact(logic));
int maxNearbyEntities = ((int) MethodHandles.maxNearbyEntities_getter.invokeExact(logic));
for(int i = 0; i < spawnCount; ++i) {
Entity entity = EntityList.createEntityByName(((String) BotaniaMethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld());
Entity entity = EntityList.createEntityByName(((String) MethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld());
if (entity == null)
return;
@@ -95,7 +92,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver {
entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F);
if(entityliving == null || entityliving.getCanSpawnHere() && entityliving.isNotColliding()) {
BotaniaMethodHandles.spawnNewEntity.invokeExact(logic, entity, true);
MethodHandles.spawnNewEntity.invokeExact(logic, entity, true);
this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0);
if(entityliving != null) {
@@ -120,15 +117,15 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver {
// Direct copy of MobSpawnerBaseLogic.resetTimer()
private void resetTimer(MobSpawnerBaseLogic logic) throws Throwable {
int maxSpawnDelay = ((int) BotaniaMethodHandles.maxSpawnDelay_getter.invokeExact(logic));
int minSpawnDelay = ((int) BotaniaMethodHandles.minSpawnDelay_getter.invokeExact(logic));
List potentialEntitySpawns = ((List) BotaniaMethodHandles.potentialSpawns_getter.invokeExact(logic));
int maxSpawnDelay = ((int) MethodHandles.maxSpawnDelay_getter.invokeExact(logic));
int minSpawnDelay = ((int) MethodHandles.minSpawnDelay_getter.invokeExact(logic));
List potentialEntitySpawns = ((List) MethodHandles.potentialSpawns_getter.invokeExact(logic));
if(maxSpawnDelay <= minSpawnDelay)
BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay);
MethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay);
else {
int i = maxSpawnDelay - minSpawnDelay;
BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i));
MethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i));
}
if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0)
@@ -57,7 +57,7 @@ import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileMod;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.helper.Vector3;
@@ -151,7 +151,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
int age;
try {
age = ((int) BotaniaMethodHandles.itemAge_getter.invokeExact(item));
age = ((int) MethodHandles.itemAge_getter.invokeExact(item));
} catch (Throwable throwable) { return false; }
if(age > 100 && age < 130 || !catalystsRegistered)
@@ -171,7 +171,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
ItemStack output = recipe.getOutput().copy();
EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output);
try {
BotaniaMethodHandles.itemAge_setter.invokeExact(outputItem, 105);
MethodHandles.itemAge_setter.invokeExact(outputItem, 105);
} catch (Throwable ignored) {}
worldObj.spawnEntityInWorld(outputItem);
}
@@ -1,24 +1,24 @@
package vazkii.botania.common.core.handler;
import com.google.common.base.Throwables;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import vazkii.botania.common.lib.LibObfuscation;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import static java.lang.invoke.MethodHandles.publicLookup;
// MethodHandles for frequently reflected fields and methods.
// Handles suffixed with _getter and _setter are for fields, while those without suffixes are normal methods.
public final class BotaniaMethodHandles {
public final class MethodHandles {
public static final MethodHandle
renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager
itemAge_getter, itemAge_setter, pickupDelay_getter, // EntityItem, pickup delay already has setter in vanilla
spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter,
maxSpawnDelay_getter, minSpawnDelay_getter,
@@ -27,82 +27,71 @@ public final class BotaniaMethodHandles {
static {
try {
Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX);
Field f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE);
f.setAccessible(true);
renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY);
f.setAccessible(true);
renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ);
f.setAccessible(true);
renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE);
f.setAccessible(true);
itemAge_getter = MethodHandles.publicLookup().unreflectGetter(f);
itemAge_setter = MethodHandles.publicLookup().unreflectSetter(f);
itemAge_getter = publicLookup().unreflectGetter(f);
itemAge_setter = publicLookup().unreflectSetter(f);
f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY);
f.setAccessible(true);
pickupDelay_getter = MethodHandles.publicLookup().unreflectGetter(f);
pickupDelay_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_RANGE);
f.setAccessible(true);
spawnRange_getter = MethodHandles.publicLookup().unreflectGetter(f);
spawnRange_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_COUNT);
f.setAccessible(true);
spawnCount_getter = MethodHandles.publicLookup().unreflectGetter(f);
spawnCount_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_NEARBY_ENTITIES);
f.setAccessible(true);
maxNearbyEntities_getter = MethodHandles.publicLookup().unreflectGetter(f);
maxNearbyEntities_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_SPAWN_DELAY);
f.setAccessible(true);
maxSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f);
maxSpawnDelay_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MIN_SPAWN_DELAY);
f.setAccessible(true);
minSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f);
minSpawnDelay_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY);
f.setAccessible(true);
spawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f);
spawnDelay_getter = publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY);
f.setAccessible(true);
spawnDelay_setter = MethodHandles.publicLookup().unreflectSetter(f);
spawnDelay_setter = publicLookup().unreflectSetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION);
f.setAccessible(true);
prevMobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f);
prevMobRotation_setter = publicLookup().unreflectSetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION);
f.setAccessible(true);
mobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f);
mobRotation_setter = publicLookup().unreflectSetter(f);
f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.POTENTIAL_ENTITY_SPAWNS);
f.setAccessible(true);
potentialSpawns_getter = MethodHandles.publicLookup().unreflectGetter(f);
potentialSpawns_getter = publicLookup().unreflectGetter(f);
Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED);
m.setAccessible(true);
isActivated = MethodHandles.publicLookup().unreflect(m);
isActivated = publicLookup().unreflect(m);
m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class);
m.setAccessible(true);
spawnNewEntity = MethodHandles.publicLookup().unreflect(m);
spawnNewEntity = publicLookup().unreflect(m);
m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN);
m.setAccessible(true);
getEntityNameToSpawn = MethodHandles.publicLookup().unreflect(m);
getEntityNameToSpawn = publicLookup().unreflect(m);
} catch (Throwable t) {
FMLLog.severe("[Botania]: Couldn't initialize methodhandles! Things will be broken!");
throw Throwables.propagate(t);
}
}
private BotaniaMethodHandles() {}
private MethodHandles() {}
}
@@ -21,7 +21,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.helper.Vector3;
public class EntityThrownItem extends EntityItem {
@@ -36,7 +36,7 @@ public class EntityThrownItem extends EntityItem {
int pickupDelay = 0;
try {
pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(item);
pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(item);
} catch (Throwable ignored) {}
item.setPickupDelay(pickupDelay);
@@ -71,7 +71,7 @@ public class EntityThrownItem extends EntityItem {
int pickupDelay;
try {
pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(this);
pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this);
} catch (Throwable ignored) { continue; }
if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0))
@@ -38,13 +38,13 @@ import net.minecraftforge.common.MinecraftForge;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientMethodHandles;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.gui.crafting.InventoryCraftingHalo;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.achievement.ICraftAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.core.helper.InventoryHelper.GenericInventory;
import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -398,9 +398,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
double renderPosX, renderPosY, renderPosZ;
try {
renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager());
} catch (Throwable t) {
return;
}
@@ -31,7 +31,7 @@ import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider;
import vazkii.botania.api.item.IWireframeCoordinateListProvider;
import vazkii.botania.common.achievement.ICraftAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.core.handler.BotaniaMethodHandles;
import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.crafting.recipe.AesirRingRecipe;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibItemNames;
@@ -71,12 +71,12 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe
entity.motionZ = event.entityItem.motionZ;
try {
BotaniaMethodHandles.itemAge_setter.invokeExact(entity, BotaniaMethodHandles.itemAge_getter.invokeExact(entity));
MethodHandles.itemAge_setter.invokeExact(entity, MethodHandles.itemAge_getter.invokeExact(entity));
} catch (Throwable ignored) {}
int pickupDelay = 0;
try {
pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(event.entityItem);
pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(event.entityItem);
} catch (Throwable ignored) {}
entity.setPickupDelay(pickupDelay);