2.2.6
This commit is contained in:
1 parent
758fa58b1b
commit
c00d57e4e0
63 files changed
+7541
-2626
No files matched your search
+1
-1
@@ -26,7 +26,7 @@ public final class AntarchyFabricClient implements ClientModInitializer {
|
||||
com.craisinlord.antarchy.Antarchy.physicalClient = true;
|
||||
com.craisinlord.antarchy.content.AntarchyAnthologyHooks.registerClient();
|
||||
ModelLoadingPlugin.register(plugin -> plugin.addModels(SeparateLargeItemModels.all()));
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> QueenMusicHandler.tick(client, AntarchyFabricSounds.THE_QUEEN.get()));
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> QueenMusicHandler.tick(client, AntarchyFabricSounds.THE_QUEEN));
|
||||
AntarchyFabricClientNetworking.register();
|
||||
AntarchyFabricClientBootstrap.register();
|
||||
AntarchyComputerGames.register();
|
||||
|
||||
+23
@@ -30,6 +30,19 @@ public final class AntarchyKeyBindings {
|
||||
GLFW.GLFW_KEY_R,
|
||||
CATEGORY
|
||||
);
|
||||
public static final KeyMapping MOUNT_BEAM = new KeyMapping(
|
||||
"key.antarchy.mount_beam",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_H,
|
||||
CATEGORY
|
||||
);
|
||||
|
||||
public static final KeyMapping MOUNT_SIGNATURE = new KeyMapping(
|
||||
"key.antarchy.mount_signature",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_J,
|
||||
CATEGORY
|
||||
);
|
||||
public static final KeyMapping TIGERS_EYE_CAMOUFLAGE = new KeyMapping(
|
||||
"key.antarchy.tigers_eye_camouflage",
|
||||
InputConstants.Type.KEYSYM,
|
||||
@@ -68,6 +81,8 @@ public final class AntarchyKeyBindings {
|
||||
KeyBindingHelper.registerKeyBinding(BRUTALFLY_FLAP);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_SPECIAL);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_FLIGHT_TOGGLE);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_BEAM);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_SIGNATURE);
|
||||
KeyBindingHelper.registerKeyBinding(TIGERS_EYE_CAMOUFLAGE);
|
||||
KeyBindingHelper.registerKeyBinding(ROYAL_INVERSION_TOGGLE);
|
||||
KeyBindingHelper.registerKeyBinding(ROYAL_BOUNDARY);
|
||||
@@ -87,6 +102,14 @@ public final class AntarchyKeyBindings {
|
||||
return Minecraft.getInstance().screen == null && MOUNT_FLIGHT_TOGGLE.isDown();
|
||||
}
|
||||
|
||||
public static boolean isMountBeamPressed() {
|
||||
return Minecraft.getInstance().screen == null && MOUNT_BEAM.isDown();
|
||||
}
|
||||
|
||||
public static boolean isMountSignaturePressed() {
|
||||
return Minecraft.getInstance().screen == null && MOUNT_SIGNATURE.isDown();
|
||||
}
|
||||
|
||||
public static boolean consumeTigerEyeCamouflagePressed() {
|
||||
return Minecraft.getInstance().screen == null && TIGERS_EYE_CAMOUFLAGE.consumeClick();
|
||||
}
|
||||
|
||||
+16
@@ -12,6 +12,8 @@ public final class RoyalMountClientHandler {
|
||||
private static boolean wasAttack;
|
||||
private static boolean wasSpecial;
|
||||
private static boolean wasFlightToggle;
|
||||
private static boolean wasBeam;
|
||||
private static boolean wasSignature;
|
||||
private static boolean wasAscend;
|
||||
private static boolean wasDescend;
|
||||
private static boolean wasUse;
|
||||
@@ -57,6 +59,18 @@ public final class RoyalMountClientHandler {
|
||||
}
|
||||
wasFlightToggle = flightToggle;
|
||||
|
||||
boolean beam = AntarchyKeyBindings.isMountBeamPressed();
|
||||
if (beam && !wasBeam) {
|
||||
ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.BEAM));
|
||||
}
|
||||
wasBeam = beam;
|
||||
|
||||
boolean signature = AntarchyKeyBindings.isMountSignaturePressed();
|
||||
if (signature && !wasSignature) {
|
||||
ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.SIGNATURE));
|
||||
}
|
||||
wasSignature = signature;
|
||||
|
||||
boolean ascend = mc.options.keyJump.isDown();
|
||||
boolean descend = mc.options.keyShift.isDown();
|
||||
if (ascend != wasAscend || descend != wasDescend) {
|
||||
@@ -73,6 +87,8 @@ public final class RoyalMountClientHandler {
|
||||
wasAttack = false;
|
||||
wasSpecial = false;
|
||||
wasFlightToggle = false;
|
||||
wasBeam = false;
|
||||
wasSignature = false;
|
||||
wasAscend = false;
|
||||
wasDescend = false;
|
||||
}
|
||||
|
||||
+6
@@ -29,5 +29,11 @@ public class AmendmentRareOresMixin {
|
||||
new Amendment.MatchingBlockTagSelector("antarchy:infinity_dimension_rare_ores"),
|
||||
new Amendment.SetValue(0.02)
|
||||
));
|
||||
data.computeIfAbsent(ConfigType.EFFECTS, k -> new ArrayList<>()).add(new Amendment(
|
||||
ConfigType.EFFECTS,
|
||||
new Amendment.MatchingModSelector("antarchy"),
|
||||
new Amendment.MatchingSelector("antarchy:paralyzed"),
|
||||
new Amendment.SetValue(0.0)
|
||||
));
|
||||
}
|
||||
}
|
||||
+2
@@ -207,6 +207,8 @@ public final class AntarchyFabricNetworking {
|
||||
case RoyalMountActionPayload.FLIGHT_TOGGLE -> mount.toggleMountedFlight(player);
|
||||
case RoyalMountActionPayload.BITE -> mount.handleMountedBite(player);
|
||||
case RoyalMountActionPayload.SPIT -> mount.handleMountedSpit(player);
|
||||
case RoyalMountActionPayload.BEAM -> mount.handleMountedBeam(player);
|
||||
case RoyalMountActionPayload.SIGNATURE -> mount.handleMountedSignature(player);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user