mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Clean up some reflection
This commit is contained in:
1 parent
ea4ecf92af
commit
144f023041
3 files changed
+21
-16
No files matched your search
@@ -28,6 +28,7 @@ import vazkii.botania.api.item.IExoflameHeatable;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.capability.SimpleCapProvider;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
@@ -39,19 +40,8 @@ public class ExoflameFurnaceHandler {
|
||||
|
||||
public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "exoflame_heatable");
|
||||
|
||||
private static final MethodHandle CAN_SMELT;
|
||||
private static final MethodHandle RECIPE_TYPE;
|
||||
|
||||
static {
|
||||
try {
|
||||
Field recipeType = ObfuscationReflectionHelper.findField(AbstractFurnaceTileEntity.class, "field_214014_c");
|
||||
RECIPE_TYPE = MethodHandles.lookup().unreflectGetter(recipeType);
|
||||
Method canSmelt = ObfuscationReflectionHelper.findMethod(AbstractFurnaceTileEntity.class, "func_214008_b", IRecipe.class);
|
||||
CAN_SMELT = MethodHandles.lookup().unreflect(canSmelt);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Failed to reflect furnace");
|
||||
}
|
||||
}
|
||||
private static final MethodHandle CAN_SMELT = LibObfuscation.getMethod(AbstractFurnaceTileEntity.class, "func_214008_b", IRecipe.class);
|
||||
private static final MethodHandle RECIPE_TYPE = LibObfuscation.getGetter(AbstractFurnaceTileEntity.class, "field_214014_c");
|
||||
|
||||
@SubscribeEvent
|
||||
public static void attachFurnaceCapability(AttachCapabilitiesEvent<TileEntity> event) {
|
||||
|
||||
@@ -48,6 +48,7 @@ import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.List;
|
||||
|
||||
@@ -55,6 +56,7 @@ public class ItemCacophonium extends Item {
|
||||
|
||||
private static final String TAG_SOUND = "sound";
|
||||
private static final String TAG_SOUND_NAME = "soundName";
|
||||
private static final MethodHandle GET_AMBIENT_SOUND = LibObfuscation.getMethod(MobEntity.class, LibObfuscation.GET_LIVING_SOUND);
|
||||
|
||||
public ItemCacophonium(Properties props) {
|
||||
super(props);
|
||||
@@ -72,9 +74,9 @@ public class ItemCacophonium extends Item {
|
||||
sound = ((SlimeEntity) living).isSmallSlime() ? SoundEvents.ENTITY_SLIME_SQUISH_SMALL : SoundEvents.ENTITY_SLIME_SQUISH;
|
||||
else {
|
||||
try {
|
||||
sound = (SoundEvent) ObfuscationReflectionHelper.findMethod(MobEntity.class, LibObfuscation.GET_LIVING_SOUND).invoke(living);
|
||||
} catch (InvocationTargetException | IllegalAccessException ignored) {
|
||||
Botania.LOGGER.debug("Couldn't get living sound");
|
||||
sound = (SoundEvent) GET_AMBIENT_SOUND.invokeExact(living);
|
||||
} catch (Throwable ex) {
|
||||
Botania.LOGGER.debug("Couldn't get living sound", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,10 +10,12 @@
|
||||
*/
|
||||
package vazkii.botania.common.lib;
|
||||
|
||||
import cpw.mods.modlauncher.api.INameMappingService;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
public final class LibObfuscation {
|
||||
// EntityLiving
|
||||
@@ -28,6 +30,17 @@ public final class LibObfuscation {
|
||||
// HoeItem
|
||||
public static final String HOE_LOOKUP = "field_195973_b";
|
||||
|
||||
public static MethodHandle getGetter(Class<?> clazz, String srg) {
|
||||
try {
|
||||
// From ObfuscationReflectionHelper.findField, because it has weird generics that fail when called alone
|
||||
Field f = clazz.getDeclaredField(ObfuscationReflectionHelper.remapName(INameMappingService.Domain.FIELD, srg));
|
||||
f.setAccessible(true);
|
||||
return MethodHandles.publicLookup().unreflectGetter(f);
|
||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||
throw new IllegalStateException("Can't find " + srg, e);
|
||||
}
|
||||
}
|
||||
|
||||
public static MethodHandle getMethod(Class<?> clazz, String srg, Class<?>... paramTypes) {
|
||||
try {
|
||||
return MethodHandles.publicLookup().unreflect(ObfuscationReflectionHelper.findMethod(clazz, srg, paramTypes));
|
||||
|
||||
Reference in new issue
Block a user