Compare commits
No commits in common. "52c0e78be53ea7334ae74bb6541edbbcb44cf881" and "930c66aa51aeb413efbfdbd765e0753230d27bfb" have entirely different histories.
52c0e78be5
...
930c66aa51
@ -9,9 +9,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
|
|
||||||
@Mixin(LivingEntity.class)
|
@Mixin(LivingEntity.class)
|
||||||
public class GlobalGlow {
|
public class GlobalGlow {
|
||||||
|
private static final HaxxorOptions options = HaxxorOptions.getInstance();
|
||||||
|
|
||||||
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
|
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
|
||||||
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
|
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
|
||||||
if (HaxxorOptions.getInstance().glow.enabled.get()) {
|
if (options.glow.enabled.get()) {
|
||||||
cir.setReturnValue(true);
|
cir.setReturnValue(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,10 +9,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
|
|
||||||
@Mixin(Entity.class)
|
@Mixin(Entity.class)
|
||||||
public class GlobalGlowAll {
|
public class GlobalGlowAll {
|
||||||
|
private static final HaxxorOptions options = HaxxorOptions.getInstance();
|
||||||
|
|
||||||
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
|
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
|
||||||
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
|
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
|
||||||
HaxxorOptions options = HaxxorOptions.getInstance();
|
|
||||||
|
|
||||||
if (options.glow.enabled.get() && options.glow.include_non_living.get()) {
|
if (options.glow.enabled.get() && options.glow.include_non_living.get()) {
|
||||||
cir.setReturnValue(true);
|
cir.setReturnValue(true);
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,11 @@
|
|||||||
"haxxor.options.fall_damage": "Fall Damage Cancel",
|
"haxxor.options.fall_damage": "Fall Damage Cancel",
|
||||||
"haxxor.options.fall_damage.title": "Fall Damage Cancel Options",
|
"haxxor.options.fall_damage.title": "Fall Damage Cancel Options",
|
||||||
|
|
||||||
|
"haxxor.options.glow": "Glow",
|
||||||
|
"haxxor.options.glow.title": "Glow Options",
|
||||||
|
"haxxor.options.glow.enabled": "Glow: %s",
|
||||||
|
"haxxor.options.glow.include_non_living": "Include Non-Living",
|
||||||
|
|
||||||
"haxxor.options.ui": "UI",
|
"haxxor.options.ui": "UI",
|
||||||
"haxxor.options.ui.title": "UI Options",
|
"haxxor.options.ui.title": "UI Options",
|
||||||
"haxxor.options.ui.hud_enabled": "Show HUD",
|
"haxxor.options.ui.hud_enabled": "Show HUD",
|
||||||
@ -44,11 +49,6 @@
|
|||||||
"haxxor.options.elevator.max_tp_up": "Max Tp Up",
|
"haxxor.options.elevator.max_tp_up": "Max Tp Up",
|
||||||
"haxxor.options.elevator.max_tp_down": "Max Tp Down",
|
"haxxor.options.elevator.max_tp_down": "Max Tp Down",
|
||||||
|
|
||||||
"haxxor.options.glow": "Glow",
|
|
||||||
"haxxor.options.glow.title": "Glow Options",
|
|
||||||
"haxxor.options.glow.enabled": "Glow: %s",
|
|
||||||
"haxxor.options.glow.include_non_living": "Include Non-Living",
|
|
||||||
|
|
||||||
"category.haxxor.options": "Haxxor",
|
"category.haxxor.options": "Haxxor",
|
||||||
"key.haxxor.auto_farm": "Auto Farm",
|
"key.haxxor.auto_farm": "Auto Farm",
|
||||||
"key.haxxor.fly": "Fly Hack",
|
"key.haxxor.fly": "Fly Hack",
|
||||||
|
Loading…
Reference in New Issue
Block a user