Skip to content
This repository was archived by the owner on Feb 19, 2019. It is now read-only.

Commit 42fc0f9

Browse files
committed
Fix ReflectionUtils#findMethod
1 parent 09a0461 commit 42fc0f9

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/main/java/clientapi/load/mixin/MixinGuiIngame.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
import net.minecraft.entity.player.EntityPlayer;
2727
import net.minecraft.scoreboard.ScoreObjective;
2828
import net.minecraft.util.math.MathHelper;
29-
import org.spongepowered.asm.lib.Opcodes;
3029
import org.spongepowered.asm.mixin.Mixin;
3130
import org.spongepowered.asm.mixin.injection.At;
3231
import org.spongepowered.asm.mixin.injection.Inject;
3332
import org.spongepowered.asm.mixin.injection.Redirect;
3433
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3534

35+
import static org.spongepowered.asm.lib.Opcodes.GETFIELD;
36+
3637
/**
3738
* @author Brady
3839
* @since 5/24/2018 10:53 AM
@@ -116,14 +117,14 @@ private void renderAttackIndicator(GuiIngame gui, int x, int y, int textureX, in
116117
gui.drawTexturedModalRect(x, y, textureX, textureY, width, height);
117118
}
118119

119-
@Redirect(method = "renderAttackIndicator", at = @At(value = "FIELD", target = "net/minecraft/client/settings/GameSettings.attackIndicator:I", opcode = Opcodes.GETFIELD))
120+
@Redirect(method = "renderAttackIndicator", at = @At(value = "FIELD", target = "net/minecraft/client/settings/GameSettings.attackIndicator:I", opcode = GETFIELD))
120121
private int renderAttackIndicator$attackIndicator(GameSettings gameSettings) {
121122
HudOverlayEvent event = new HudOverlayEvent(HudOverlayEvent.Type.ATTACK_INDICATOR);
122123
ClientAPI.EVENT_BUS.post(event);
123124
return event.isCancelled() ? 0 : gameSettings.attackIndicator;
124125
}
125126

126-
@Redirect(method = "renderHotbar", at = @At(value = "FIELD", target = "net/minecraft/client/settings/GameSettings.attackIndicator:I", opcode = Opcodes.GETFIELD))
127+
@Redirect(method = "renderHotbar", at = @At(value = "FIELD", target = "net/minecraft/client/settings/GameSettings.attackIndicator:I", opcode = GETFIELD))
127128
private int renderHotbar$attackIndicator(GameSettings gameSettings) {
128129
HudOverlayEvent event = new HudOverlayEvent(HudOverlayEvent.Type.ATTACK_INDICATOR);
129130
ClientAPI.EVENT_BUS.post(event);

src/main/java/clientapi/util/ReflectionUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public static boolean setField(Object object, Field field, Object value) {
158158
*/
159159
public static Method findMethod(Class<?> clazz, String name, Class<?>... parameters) {
160160
for (Method method : clazz.getDeclaredMethods()) {
161-
if (method.getName().equals(name) && Arrays.deepEquals(method.getParameters(), parameters)) {
161+
if (method.getName().equals(name) && Arrays.deepEquals(method.getParameterTypes(), parameters)) {
162162
return method;
163163
}
164164
}

0 commit comments

Comments
 (0)