first draft royal
This commit is contained in:
1 parent
ce66f56c87
commit
357f41d9d6
179 files changed
+29573
-611
No files matched your search
@@ -317,6 +317,12 @@ public final class AntarchyFabricContent {
|
||||
AntarchyObjects.setVortex(AntarchyFabricEntities.VORTEX);
|
||||
AntarchyObjects.setWindVortex(() -> AntarchyFabricEntities.WIND_VORTEX.get());
|
||||
AntarchyObjects.setVortexChargeProjectile(() -> AntarchyFabricEntities.VORTEX_CHARGE_PROJECTILE.get());
|
||||
AntarchyObjects.setPrince(() -> AntarchyFabricEntities.PRINCE.get());
|
||||
AntarchyObjects.setPrincess(() -> AntarchyFabricEntities.PRINCESS.get());
|
||||
AntarchyObjects.setRoyalBolt(() -> AntarchyFabricEntities.ROYAL_BOLT.get());
|
||||
AntarchyObjects.setPrinceEgg(() -> AntarchyFabricBlocks.PRINCE_EGG.get());
|
||||
AntarchyObjects.setPrincessEgg(() -> AntarchyFabricBlocks.PRINCESS_EGG.get());
|
||||
AntarchyObjects.setRoyalEggBlockEntity(() -> AntarchyFabricBlocks.ROYAL_EGG_BLOCK_ENTITY.get());
|
||||
AntarchyObjects.setVortexLens(() -> AntarchyFabricBlocks.VORTEX_LENS.get());
|
||||
AntarchyObjects.setVortexLensBlockEntity(() -> AntarchyFabricBlocks.VORTEX_LENS_BLOCK_ENTITY.get());
|
||||
AntarchyObjects.setKrakensGraspTrident(AntarchyFabricEntities.KRAKENS_GRASP_TRIDENT);
|
||||
|
||||
+6
@@ -164,6 +164,9 @@ public final class AntarchyFabricClientBootstrap {
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.CREEPING_HORROR.get(), CreepingHorrorRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.LURKING_TERROR.get(), LurkingTerrorRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.HERCULES_BEETLE.get(), HerculesBeetleRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.PRINCE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalMountRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.PRINCESS.get(), com.craisinlord.antarchy.content.client.renderer.RoyalMountRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.ROYAL_BOLT.get(), com.craisinlord.antarchy.content.client.renderer.RoyalBoltRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.JERRY.get(), JerryRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.JUMPY_BUG.get(), JumpyBugRenderer::new);
|
||||
EntityRendererRegistry.register(AntarchyFabricEntities.SPIT_BUG.get(), SpitBugRenderer::new);
|
||||
@@ -520,17 +523,20 @@ public final class AntarchyFabricClientBootstrap {
|
||||
ParalyzedClientHandler.tick();
|
||||
DreadClientHandler.tick();
|
||||
TigerEyeCamouflageClientHandler.tick();
|
||||
RoyalInversionClientHandler.tick();
|
||||
BloodCrystalKatanaTrailHandler.tick();
|
||||
ScorpionWhipTetherRenderHandler.tick();
|
||||
WormHookTetherRenderHandler.tick();
|
||||
DorrieJumpClientHandler.tick();
|
||||
HerculesBeetleClientHandler.tick();
|
||||
RoyalMountClientHandler.tick();
|
||||
SizeRaySoundHandler.tick(client);
|
||||
});
|
||||
|
||||
BigBerthaClientHandler.register();
|
||||
GravityGunClientHandler.register();
|
||||
PortalGunClientHandler.register();
|
||||
EyeOfStormClientHandler.register();
|
||||
|
||||
ElythiaFireflyManager.register();
|
||||
LucidSoundHandler.register();
|
||||
|
||||
+22
-10
@@ -24,15 +24,15 @@ public final class AntarchyKeyBindings {
|
||||
CATEGORY
|
||||
);
|
||||
|
||||
public static final KeyMapping HERCULES_BEETLE_CHARGE = new KeyMapping(
|
||||
"key.antarchy.hercules_beetle_charge",
|
||||
public static final KeyMapping MOUNT_SPECIAL = new KeyMapping(
|
||||
"key.antarchy.mount_special",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_LEFT_CONTROL,
|
||||
CATEGORY
|
||||
);
|
||||
|
||||
public static final KeyMapping HERCULES_BEETLE_FLIGHT_TOGGLE = new KeyMapping(
|
||||
"key.antarchy.hercules_beetle_flight_toggle",
|
||||
public static final KeyMapping MOUNT_FLIGHT_TOGGLE = new KeyMapping(
|
||||
"key.antarchy.mount_flight_toggle",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_R,
|
||||
CATEGORY
|
||||
@@ -44,14 +44,22 @@ public final class AntarchyKeyBindings {
|
||||
CATEGORY
|
||||
);
|
||||
|
||||
public static final KeyMapping ROYAL_INVERSION_TOGGLE = new KeyMapping(
|
||||
"key.antarchy.royal_inversion_toggle",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_V,
|
||||
CATEGORY
|
||||
);
|
||||
|
||||
private AntarchyKeyBindings() {}
|
||||
|
||||
public static void register() {
|
||||
KeyBindingHelper.registerKeyBinding(BRUTALFLY_FLAP);
|
||||
KeyBindingHelper.registerKeyBinding(DORRIE_CHARGE_JUMP);
|
||||
KeyBindingHelper.registerKeyBinding(HERCULES_BEETLE_CHARGE);
|
||||
KeyBindingHelper.registerKeyBinding(HERCULES_BEETLE_FLIGHT_TOGGLE);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_SPECIAL);
|
||||
KeyBindingHelper.registerKeyBinding(MOUNT_FLIGHT_TOGGLE);
|
||||
KeyBindingHelper.registerKeyBinding(TIGERS_EYE_CAMOUFLAGE);
|
||||
KeyBindingHelper.registerKeyBinding(ROYAL_INVERSION_TOGGLE);
|
||||
}
|
||||
|
||||
public static boolean isBrutalflyFlapPressed() {
|
||||
@@ -62,15 +70,19 @@ public final class AntarchyKeyBindings {
|
||||
return Minecraft.getInstance().screen == null && DORRIE_CHARGE_JUMP.isDown();
|
||||
}
|
||||
|
||||
public static boolean isHerculesBeetleChargePressed() {
|
||||
return Minecraft.getInstance().screen == null && HERCULES_BEETLE_CHARGE.isDown();
|
||||
public static boolean isMountSpecialPressed() {
|
||||
return Minecraft.getInstance().screen == null && MOUNT_SPECIAL.isDown();
|
||||
}
|
||||
|
||||
public static boolean isHerculesBeetleFlightTogglePressed() {
|
||||
return Minecraft.getInstance().screen == null && HERCULES_BEETLE_FLIGHT_TOGGLE.isDown();
|
||||
public static boolean isMountFlightTogglePressed() {
|
||||
return Minecraft.getInstance().screen == null && MOUNT_FLIGHT_TOGGLE.isDown();
|
||||
}
|
||||
|
||||
public static boolean consumeTigerEyeCamouflagePressed() {
|
||||
return Minecraft.getInstance().screen == null && TIGERS_EYE_CAMOUFLAGE.consumeClick();
|
||||
}
|
||||
|
||||
public static boolean consumeRoyalInversionTogglePressed() {
|
||||
return Minecraft.getInstance().screen == null && ROYAL_INVERSION_TOGGLE.consumeClick();
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.craisinlord.antarchy.fabric.client;
|
||||
|
||||
import com.craisinlord.antarchy.config.AntarchySettings;
|
||||
import com.craisinlord.antarchy.content.item.EyeOfTheStormItem;
|
||||
import com.craisinlord.antarchy.content.network.EyeOfStormPrimaryPayload;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
public final class EyeOfStormClientHandler {
|
||||
private static boolean lastAttackDown;
|
||||
|
||||
private EyeOfStormClientHandler() {
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
ClientTickEvents.END_CLIENT_TICK.register(EyeOfStormClientHandler::tick);
|
||||
}
|
||||
|
||||
private static void tick(Minecraft mc) {
|
||||
if (mc.player == null || mc.level == null || mc.screen != null || !AntarchySettings.eyeOfTheStormEnabled()) {
|
||||
lastAttackDown = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(mc.player.getMainHandItem().getItem() instanceof EyeOfTheStormItem)) {
|
||||
lastAttackDown = false;
|
||||
return;
|
||||
}
|
||||
|
||||
boolean attackDown = mc.options.keyAttack.isDown();
|
||||
if (attackDown && !lastAttackDown) {
|
||||
ClientPlayNetworking.send(new EyeOfStormPrimaryPayload());
|
||||
}
|
||||
lastAttackDown = attackDown;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -43,13 +43,13 @@ public final class HerculesBeetleClientHandler {
|
||||
}
|
||||
wasPressingAttack = pressingAttack;
|
||||
|
||||
boolean charging = AntarchyKeyBindings.isHerculesBeetleChargePressed();
|
||||
boolean charging = AntarchyKeyBindings.isMountSpecialPressed();
|
||||
if (charging != wasCharging) {
|
||||
ClientPlayNetworking.send(new HerculesBeetleMountedChargePayload(charging));
|
||||
}
|
||||
wasCharging = charging;
|
||||
|
||||
boolean pressingFlightToggle = AntarchyKeyBindings.isHerculesBeetleFlightTogglePressed();
|
||||
boolean pressingFlightToggle = AntarchyKeyBindings.isMountFlightTogglePressed();
|
||||
if (pressingFlightToggle && !wasPressingFlightToggle) {
|
||||
ClientPlayNetworking.send(new HerculesBeetleFlightTogglePayload());
|
||||
}
|
||||
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.craisinlord.antarchy.fabric.client;
|
||||
|
||||
import com.craisinlord.antarchy.content.network.ToggleRoyalInversionPayload;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
public final class RoyalInversionClientHandler {
|
||||
private RoyalInversionClientHandler() {
|
||||
}
|
||||
|
||||
public static void tick() {
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
if (minecraft.player == null || minecraft.level == null) {
|
||||
return;
|
||||
}
|
||||
while (AntarchyKeyBindings.consumeRoyalInversionTogglePressed()) {
|
||||
ClientPlayNetworking.send(new ToggleRoyalInversionPayload());
|
||||
}
|
||||
}
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package com.craisinlord.antarchy.fabric.client;
|
||||
|
||||
import com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity;
|
||||
import com.craisinlord.antarchy.content.network.RoyalMountActionPayload;
|
||||
import com.craisinlord.antarchy.content.network.RoyalMountVerticalPayload;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
|
||||
public final class RoyalMountClientHandler {
|
||||
private static boolean wasAttack;
|
||||
private static boolean wasSpecial;
|
||||
private static boolean wasFlightToggle;
|
||||
private static boolean wasAscend;
|
||||
private static boolean wasDescend;
|
||||
|
||||
private RoyalMountClientHandler() {
|
||||
}
|
||||
|
||||
public static void tick() {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
LocalPlayer player = mc.player;
|
||||
if (player == null || mc.screen != null || !(player.getVehicle() instanceof RoyalMountEntity)) {
|
||||
reset();
|
||||
return;
|
||||
}
|
||||
|
||||
boolean attack = mc.options.keyAttack.isDown();
|
||||
if (attack && !wasAttack) {
|
||||
ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.BITE));
|
||||
}
|
||||
wasAttack = attack;
|
||||
|
||||
boolean special = AntarchyKeyBindings.isMountSpecialPressed();
|
||||
if (special && !wasSpecial) {
|
||||
ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.SPIT));
|
||||
}
|
||||
wasSpecial = special;
|
||||
|
||||
boolean flightToggle = AntarchyKeyBindings.isMountFlightTogglePressed();
|
||||
if (flightToggle && !wasFlightToggle) {
|
||||
ClientPlayNetworking.send(new RoyalMountActionPayload(RoyalMountActionPayload.FLIGHT_TOGGLE));
|
||||
}
|
||||
wasFlightToggle = flightToggle;
|
||||
|
||||
boolean ascend = mc.options.keyJump.isDown();
|
||||
boolean descend = mc.options.keyShift.isDown();
|
||||
if (ascend != wasAscend || descend != wasDescend) {
|
||||
ClientPlayNetworking.send(new RoyalMountVerticalPayload(ascend, descend));
|
||||
wasAscend = ascend;
|
||||
wasDescend = descend;
|
||||
}
|
||||
}
|
||||
|
||||
private static void reset() {
|
||||
if (wasAscend || wasDescend) {
|
||||
ClientPlayNetworking.send(new RoyalMountVerticalPayload(false, false));
|
||||
}
|
||||
wasAttack = false;
|
||||
wasSpecial = false;
|
||||
wasFlightToggle = false;
|
||||
wasAscend = false;
|
||||
wasDescend = false;
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -3,6 +3,7 @@ package com.craisinlord.antarchy.fabric.mixin;
|
||||
import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi;
|
||||
import com.craisinlord.antarchy.content.item.BloodCrystalArmorItem;
|
||||
import com.craisinlord.antarchy.content.item.JumpyBootsItem;
|
||||
import com.craisinlord.antarchy.content.item.royal.RoyalGearHelper;
|
||||
import com.craisinlord.antarchy.fabric.util.JumpyBootsFabricHelper;
|
||||
import net.minecraft.world.damagesource.DamageSource;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
@@ -25,7 +26,8 @@ public abstract class JumpyBootsFallDamageMixin {
|
||||
if (!AntarchyGravityApi.isGravityInverted(player)) {
|
||||
return;
|
||||
}
|
||||
if (!(player.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof BloodCrystalArmorItem)) {
|
||||
if (!(player.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof BloodCrystalArmorItem)
|
||||
&& !RoyalGearHelper.hasUpwardFallImmunityBoots(player)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+40
@@ -16,6 +16,7 @@ import com.craisinlord.antarchy.content.item.BigBerthaItem;
|
||||
import com.craisinlord.antarchy.content.item.JumpyBootsHelper;
|
||||
import com.craisinlord.antarchy.fabric.util.JumpyBootsFabricHelper;
|
||||
import com.craisinlord.antarchy.content.item.JumpyBootsItem;
|
||||
import com.craisinlord.antarchy.content.item.EyeOfTheStormItem;
|
||||
import com.craisinlord.antarchy.content.item.GravityGunItem;
|
||||
import com.craisinlord.antarchy.content.item.PortalGunItem;
|
||||
import com.craisinlord.antarchy.content.item.TigerEyeArmorUtil;
|
||||
@@ -86,9 +87,13 @@ public final class AntarchyFabricNetworking {
|
||||
|
||||
PayloadTypeRegistry.playC2S().register(GravityGunPrimaryPayload.TYPE, GravityGunPrimaryPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(PortalGunPrimaryPayload.TYPE, PortalGunPrimaryPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(EyeOfStormPrimaryPayload.TYPE, EyeOfStormPrimaryPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(RoyalMountActionPayload.TYPE, RoyalMountActionPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(RoyalMountVerticalPayload.TYPE, RoyalMountVerticalPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(GravityGunScrollPayload.TYPE, GravityGunScrollPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(BigBerthaModeCyclePayload.TYPE, BigBerthaModeCyclePayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(ToggleTigerEyeCamouflagePayload.TYPE, ToggleTigerEyeCamouflagePayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(ToggleRoyalInversionPayload.TYPE, ToggleRoyalInversionPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(DiamondMinecartInputPayload.TYPE, DiamondMinecartInputPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(BrutalflyElytraFlapPayload.TYPE, BrutalflyElytraFlapPayload.STREAM_CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(JumpyBootsLaunchPayload.TYPE, JumpyBootsLaunchPayload.STREAM_CODEC);
|
||||
@@ -107,12 +112,20 @@ public final class AntarchyFabricNetworking {
|
||||
context.server().execute(() -> handleGravityGunPrimary(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(PortalGunPrimaryPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handlePortalGunPrimary(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(EyeOfStormPrimaryPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleEyeOfStormPrimary(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(RoyalMountActionPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleRoyalMountAction(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(RoyalMountVerticalPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleRoyalMountVertical(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(GravityGunScrollPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleGravityGunScroll(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(BigBerthaModeCyclePayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleBigBerthaModeCycle(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(ToggleTigerEyeCamouflagePayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleTigerEyeCamouflageToggle(context.player())));
|
||||
ServerPlayNetworking.registerGlobalReceiver(ToggleRoyalInversionPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> com.craisinlord.antarchy.content.item.RoyalAssailantArmorItem.toggleInversion(context.player())));
|
||||
ServerPlayNetworking.registerGlobalReceiver(DiamondMinecartInputPayload.TYPE, (payload, context) ->
|
||||
context.server().execute(() -> handleDiamondMinecartInput(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(BrutalflyElytraFlapPayload.TYPE, (payload, context) ->
|
||||
@@ -250,6 +263,33 @@ public final class AntarchyFabricNetworking {
|
||||
portalGunItem.firePrimary(player.serverLevel(), player, player.getMainHandItem());
|
||||
}
|
||||
|
||||
private static void handleRoyalMountAction(ServerPlayer player, RoyalMountActionPayload payload) {
|
||||
if (!(player.getVehicle() instanceof com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity mount)) {
|
||||
return;
|
||||
}
|
||||
switch (payload.action()) {
|
||||
case RoyalMountActionPayload.FLIGHT_TOGGLE -> mount.toggleMountedFlight(player);
|
||||
case RoyalMountActionPayload.BITE -> mount.handleMountedBite(player);
|
||||
case RoyalMountActionPayload.SPIT -> mount.handleMountedSpit(player);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void handleRoyalMountVertical(ServerPlayer player, RoyalMountVerticalPayload payload) {
|
||||
if (player.getVehicle() instanceof com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity mount) {
|
||||
mount.setRiderAscend(payload.ascend());
|
||||
mount.setRiderDescend(payload.descend());
|
||||
}
|
||||
}
|
||||
|
||||
private static void handleEyeOfStormPrimary(ServerPlayer player, EyeOfStormPrimaryPayload payload) {
|
||||
if (!(player.getMainHandItem().getItem() instanceof EyeOfTheStormItem eyeOfTheStormItem)) {
|
||||
return;
|
||||
}
|
||||
eyeOfTheStormItem.firePrimary(player.serverLevel(), player, player.getMainHandItem());
|
||||
}
|
||||
|
||||
private static void handleGravityGunScroll(ServerPlayer player, GravityGunScrollPayload payload) {
|
||||
if (!(player.getMainHandItem().getItem() instanceof GravityGunItem)) {
|
||||
return;
|
||||
|
||||
+16
-4
@@ -397,12 +397,12 @@ public final class AntarchyFabricBlocks {
|
||||
() -> new net.minecraft.world.level.block.ButtonBlock(net.minecraft.world.level.block.state.properties.BlockSetType.JUNGLE, 30, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_BUTTON)));
|
||||
|
||||
|
||||
public static final DeferredBlock<net.minecraft.world.level.block.LeavesBlock> ROYAL_LEAVES = BLOCKS.register("royal_leaves",
|
||||
() -> new net.minecraft.world.level.block.LeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.RoyalLeavesBlock> ROYAL_LEAVES = BLOCKS.register("royal_leaves",
|
||||
() -> new com.craisinlord.antarchy.content.block.RoyalLeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
|
||||
|
||||
|
||||
public static final DeferredBlock<net.minecraft.world.level.block.LeavesBlock> ROYAL_FLOWERING_LEAVES = BLOCKS.register("royal_flowering_leaves",
|
||||
() -> new net.minecraft.world.level.block.LeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.RoyalLeavesBlock> ROYAL_FLOWERING_LEAVES = BLOCKS.register("royal_flowering_leaves",
|
||||
() -> new com.craisinlord.antarchy.content.block.RoyalLeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
|
||||
|
||||
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.RoyalSaplingBlock> ROYAL_SAPLING = BLOCKS.register("royal_sapling",
|
||||
@@ -947,6 +947,11 @@ public final class AntarchyFabricBlocks {
|
||||
public static final DeferredBlock<CreepingHorrorEggBlock> CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg",
|
||||
() -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG)));
|
||||
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.PrinceEggBlock> PRINCE_EGG = BLOCKS.register("prince_egg",
|
||||
() -> new com.craisinlord.antarchy.content.block.PrinceEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion()));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.PrincessEggBlock> PRINCESS_EGG = BLOCKS.register("princess_egg",
|
||||
() -> new com.craisinlord.antarchy.content.block.PrincessEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion()));
|
||||
|
||||
|
||||
public static final DeferredBlock<JumpyBugEggBlock> JUMPY_BUG_EGG = BLOCKS.register("jumpy_bug_egg",
|
||||
() -> new JumpyBugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG)));
|
||||
@@ -1398,6 +1403,13 @@ public final class AntarchyFabricBlocks {
|
||||
() -> new StarCoralWallFanBlock(DEAD_STAR_CORAL_WALL_FAN.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.TUBE_CORAL_WALL_FAN).lightLevel(state -> 8)));
|
||||
|
||||
|
||||
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity>> ROYAL_EGG_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("royal_egg",
|
||||
() -> BlockEntityType.Builder.of(
|
||||
com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity::new,
|
||||
PRINCE_EGG.get(),
|
||||
PRINCESS_EGG.get()
|
||||
).build(null));
|
||||
|
||||
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<AntNestBlockEntity>> ANT_NEST_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("ant_nest",
|
||||
() -> BlockEntityType.Builder.of(
|
||||
AntNestBlockEntity::new,
|
||||
|
||||
+21
@@ -619,6 +619,27 @@ public final class AntarchyFabricEntities {
|
||||
.clientTrackingRange(12)
|
||||
.build("hercules_beetle"));
|
||||
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.royal.PrinceEntity>> PRINCE = ENTITY_TYPES.register("prince",
|
||||
() -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.royal.PrinceEntity::new, MobCategory.CREATURE)
|
||||
.sized(2.2F, 2.2F)
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(3)
|
||||
.fireImmune().build("prince"));
|
||||
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.royal.PrincessEntity>> PRINCESS = ENTITY_TYPES.register("princess",
|
||||
() -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.royal.PrincessEntity::new, MobCategory.CREATURE)
|
||||
.sized(2.2F, 2.2F)
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(3)
|
||||
.fireImmune().build("princess"));
|
||||
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity>> ROYAL_BOLT = ENTITY_TYPES.register("royal_bolt",
|
||||
() -> EntityType.Builder.<com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity>of(com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity::new, MobCategory.MISC)
|
||||
.sized(0.4F, 0.4F)
|
||||
.clientTrackingRange(8)
|
||||
.updateInterval(1)
|
||||
.fireImmune().build("royal_bolt"));
|
||||
|
||||
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity>> OURANWOOD_DEER = ENTITY_TYPES.register("ouranwood_deer",
|
||||
() -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity::new, MobCategory.CREATURE)
|
||||
|
||||
+2
@@ -98,6 +98,8 @@ public final class AntarchyFabricEntityAttributes {
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.CHEEP.get(), com.craisinlord.antarchy.content.entity.CheepEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.DORRIE.get(), com.craisinlord.antarchy.content.entity.DorrieEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.HERCULES_BEETLE.get(), com.craisinlord.antarchy.content.entity.HerculesBeetleEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.PRINCE.get(), com.craisinlord.antarchy.content.entity.royal.PrinceEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.PRINCESS.get(), com.craisinlord.antarchy.content.entity.royal.PrincessEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.OURANWOOD_DEER.get(), com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.GLIMMER.get(), com.craisinlord.antarchy.content.entity.glimmer.GlimmerEntity.createAttributes().build());
|
||||
FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.ELKA.get(), com.craisinlord.antarchy.content.entity.ElkaEntity.createAttributes().build());
|
||||
|
||||
+65
-4
@@ -66,6 +66,24 @@ public final class AntarchyFabricItems {
|
||||
() -> Ingredient.of(AntarchyFabricItems.HERCULES_HORN.get())
|
||||
);
|
||||
|
||||
private static final Tier ROYAL_GUARDIAN_TIER = new SimpleToolTier(
|
||||
AntarchySettings.royalWeaponDurability(),
|
||||
12.0F,
|
||||
0.0F,
|
||||
Tiers.NETHERITE.getIncorrectBlocksForDrops(),
|
||||
AntarchySettings.royalWeaponEnchantability(),
|
||||
() -> Ingredient.of(AntarchyFabricItems.KING_SCALE.get())
|
||||
);
|
||||
|
||||
private static final Tier ROYAL_ASSAILANT_TIER = new SimpleToolTier(
|
||||
AntarchySettings.royalWeaponDurability(),
|
||||
12.0F,
|
||||
0.0F,
|
||||
Tiers.NETHERITE.getIncorrectBlocksForDrops(),
|
||||
AntarchySettings.royalWeaponEnchantability(),
|
||||
() -> Ingredient.of(AntarchyFabricItems.QUEEN_SCALE.get())
|
||||
);
|
||||
|
||||
|
||||
public static final DeferredItem<Item> NIGHTMARE_SCALE = ITEMS.registerSimpleItem("nightmare_scale", new Item.Properties().rarity(Rarity.RARE).fireResistant());
|
||||
|
||||
@@ -903,6 +921,10 @@ public final class AntarchyFabricItems {
|
||||
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.BED_BUG_EGG);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.CREEPING_HORROR_EGG);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> PRINCE_EGG_ITEM = ITEMS.register("prince_egg",
|
||||
() -> new net.minecraft.world.item.BlockItem(AntarchyFabricBlocks.PRINCE_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> PRINCESS_EGG_ITEM = ITEMS.register("princess_egg",
|
||||
() -> new net.minecraft.world.item.BlockItem(AntarchyFabricBlocks.PRINCESS_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> JUMPY_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.JUMPY_BUG_EGG);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SPIT_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SPIT_BUG_EGG);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> JERRY_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.JERRY_EGG);
|
||||
@@ -1000,12 +1022,10 @@ public final class AntarchyFabricItems {
|
||||
public static final DeferredItem<Item> HERCULES_HORN = ITEMS.registerSimpleItem("hercules_horn", new Item.Properties().rarity(Rarity.UNCOMMON));
|
||||
|
||||
|
||||
public static final DeferredItem<Item> KING_SCALE = ITEMS.register("king_scale",
|
||||
() -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
public static final DeferredItem<Item> KING_SCALE = ITEMS.registerSimpleItem("king_scale", new Item.Properties().rarity(Rarity.RARE));
|
||||
|
||||
|
||||
public static final DeferredItem<Item> QUEEN_SCALE = ITEMS.register("queen_scale",
|
||||
() -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
public static final DeferredItem<Item> QUEEN_SCALE = ITEMS.registerSimpleItem("queen_scale", new Item.Properties().rarity(Rarity.RARE));
|
||||
|
||||
|
||||
public static final DeferredItem<Item> CHITIN = ITEMS.registerSimpleItem("chitin", new Item.Properties().rarity(Rarity.UNCOMMON));
|
||||
@@ -1422,6 +1442,44 @@ public final class AntarchyFabricItems {
|
||||
));
|
||||
|
||||
|
||||
public static final DeferredItem<RoyalGuardianArmorItem> ROYAL_GUARDIAN_HELMET = ITEMS.register("royal_guardian_helmet",
|
||||
() -> new RoyalGuardianArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_GUARDIAN_ARMOR_MATERIAL.get()), ArmorItem.Type.HELMET,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalGuardianArmorItem> ROYAL_GUARDIAN_CHESTPLATE = ITEMS.register("royal_guardian_chestplate",
|
||||
() -> new RoyalGuardianArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_GUARDIAN_ARMOR_MATERIAL.get()), ArmorItem.Type.CHESTPLATE,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalGuardianArmorItem> ROYAL_GUARDIAN_LEGGINGS = ITEMS.register("royal_guardian_leggings",
|
||||
() -> new RoyalGuardianArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_GUARDIAN_ARMOR_MATERIAL.get()), ArmorItem.Type.LEGGINGS,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalGuardianArmorItem> ROYAL_GUARDIAN_BOOTS = ITEMS.register("royal_guardian_boots",
|
||||
() -> new RoyalGuardianArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_GUARDIAN_ARMOR_MATERIAL.get()), ArmorItem.Type.BOOTS,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
|
||||
public static final DeferredItem<RoyalAssailantArmorItem> ROYAL_ASSAILANT_HELMET = ITEMS.register("royal_assailant_helmet",
|
||||
() -> new RoyalAssailantArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_ASSAILANT_ARMOR_MATERIAL.get()), ArmorItem.Type.HELMET,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalAssailantArmorItem> ROYAL_ASSAILANT_CHESTPLATE = ITEMS.register("royal_assailant_chestplate",
|
||||
() -> new RoyalAssailantArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_ASSAILANT_ARMOR_MATERIAL.get()), ArmorItem.Type.CHESTPLATE,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalAssailantArmorItem> ROYAL_ASSAILANT_LEGGINGS = ITEMS.register("royal_assailant_leggings",
|
||||
() -> new RoyalAssailantArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_ASSAILANT_ARMOR_MATERIAL.get()), ArmorItem.Type.LEGGINGS,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalAssailantArmorItem> ROYAL_ASSAILANT_BOOTS = ITEMS.register("royal_assailant_boots",
|
||||
() -> new RoyalAssailantArmorItem(net.minecraft.core.Holder.direct(AntarchyFabricMisc.ROYAL_ASSAILANT_ARMOR_MATERIAL.get()), ArmorItem.Type.BOOTS,
|
||||
new Item.Properties().rarity(Rarity.EPIC).fireResistant()));
|
||||
|
||||
public static final DeferredItem<RoyalGuardianSwordItem> ROYAL_GUARDIAN_SWORD = ITEMS.register("royal_guardian_sword",
|
||||
() -> new RoyalGuardianSwordItem(ROYAL_GUARDIAN_TIER,
|
||||
new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalAssailantBattleAxeItem> ROYAL_ASSAILANT_BATTLEAXE = ITEMS.register("royal_assailant_battleaxe",
|
||||
() -> new RoyalAssailantBattleAxeItem(ROYAL_ASSAILANT_TIER,
|
||||
new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).fireResistant()));
|
||||
public static final DeferredItem<RoyalGuardianShieldItem> ROYAL_GUARDIAN_SHIELD = ITEMS.register("royal_guardian_shield",
|
||||
() -> new RoyalGuardianShieldItem(
|
||||
new Item.Properties().durability(AntarchySettings.royalGuardianShieldDurability()).rarity(Rarity.EPIC).fireResistant(),
|
||||
() -> Ingredient.of(AntarchyFabricItems.KING_SCALE.get())));
|
||||
|
||||
|
||||
public static final DeferredItem<SizeRayItem> SHRINK_RAY = ITEMS.register("shrink_ray",
|
||||
() -> new SizeRayItem(
|
||||
new Item.Properties().stacksTo(1).durability(512).rarity(Rarity.RARE).fireResistant(),
|
||||
@@ -1459,6 +1517,9 @@ public final class AntarchyFabricItems {
|
||||
AntarchyFabricBlocks.PORTAL_GUN_PORTAL_BASE
|
||||
));
|
||||
|
||||
public static final DeferredItem<EyeOfTheStormItem> EYE_OF_THE_STORM = ITEMS.register("eye_of_the_storm",
|
||||
() -> new EyeOfTheStormItem(new Item.Properties().stacksTo(1).durability(384).rarity(Rarity.EPIC)));
|
||||
|
||||
|
||||
// Temporarily disabled: keeping the code but not registering the item for now.
|
||||
// public static final DeferredItem<MinersDreamItem> MINERS_DREAM = ITEMS.register("miners_dream",
|
||||
|
||||
+30
@@ -69,6 +69,8 @@ import com.craisinlord.antarchy.content.worldgen.thoraxis.NadirTreeConfiguration
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.NadirTreeFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.truffalo.TruffaloTreeConfiguration;
|
||||
import com.craisinlord.antarchy.content.worldgen.truffalo.TruffaloTreeFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.royal.RoyalTreeConfiguration;
|
||||
import com.craisinlord.antarchy.content.worldgen.royal.RoyalTreeFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisBiomeSource;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisDuneConfiguration;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisDuneFeature;
|
||||
@@ -293,6 +295,30 @@ public final class AntarchyFabricMisc {
|
||||
));
|
||||
|
||||
|
||||
public static final DeferredHolder<ArmorMaterial, ArmorMaterial> ROYAL_GUARDIAN_ARMOR_MATERIAL = ARMOR_MATERIALS.register("royal_guardian",
|
||||
() -> new ArmorMaterial(
|
||||
new java.util.EnumMap<>(ArmorItem.Type.class),
|
||||
AntarchySettings.royalArmorEnchantability(),
|
||||
SoundEvents.ARMOR_EQUIP_NETHERITE,
|
||||
() -> Ingredient.of(AntarchyFabricItems.KING_SCALE.get()),
|
||||
List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "royal_guardian"))),
|
||||
0.0F,
|
||||
0.0F
|
||||
));
|
||||
|
||||
|
||||
public static final DeferredHolder<ArmorMaterial, ArmorMaterial> ROYAL_ASSAILANT_ARMOR_MATERIAL = ARMOR_MATERIALS.register("royal_assailant",
|
||||
() -> new ArmorMaterial(
|
||||
new java.util.EnumMap<>(ArmorItem.Type.class),
|
||||
AntarchySettings.royalArmorEnchantability(),
|
||||
SoundEvents.ARMOR_EQUIP_NETHERITE,
|
||||
() -> Ingredient.of(AntarchyFabricItems.QUEEN_SCALE.get()),
|
||||
List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "royal_assailant"))),
|
||||
0.0F,
|
||||
0.0F
|
||||
));
|
||||
|
||||
|
||||
public static final DeferredHolder<ParticleType<?>, SimpleParticleType> DREAM_FIRE_FLAME = PARTICLE_TYPES.register("dream_fire_flame",
|
||||
() -> simpleParticleType());
|
||||
public static final DeferredHolder<ParticleType<?>, SimpleParticleType> NIGHTMARE_FIRE_FLAME = PARTICLE_TYPES.register("nightmare_fire_flame",
|
||||
@@ -585,6 +611,10 @@ public final class AntarchyFabricMisc {
|
||||
() -> new TruffaloTreeFeature(TruffaloTreeConfiguration.CODEC));
|
||||
|
||||
|
||||
public static final DeferredHolder<Feature<?>, RoyalTreeFeature> ROYAL_TREE_FEATURE = FEATURES.register("royal_tree",
|
||||
() -> new RoyalTreeFeature(RoyalTreeConfiguration.CODEC));
|
||||
|
||||
|
||||
public static final DeferredHolder<Feature<?>, ElythiaFloraFeature> ELYTHIA_FOREST_FLORA = FEATURES.register("elythia_forest_flora",
|
||||
() -> new ElythiaFloraFeature(NoneFeatureConfiguration.CODEC, ElythiaFloraFeature.Variant.FOREST));
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"parent": "antarchy:item/eye_of_the_storm_held_geo"
|
||||
}
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"parent": "antarchy:item/royal_assailant_battleaxe_held"
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"parent": "antarchy:item/royal_guardian_sword_held"
|
||||
}
|
||||
Reference in new issue
Block a user