bumped required infinity version
fixed server client split issue fr this time Buffed frying pan Fixed prince princess anim bug
This commit is contained in:
1 parent
5010b6b7e1
commit
23599c4c59
52 files changed
+653
-62
No files matched your search
+37
@@ -0,0 +1,37 @@
|
||||
package com.craisinlord.antarchy.neoforge.client;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.item.GiantFryingPanItem;
|
||||
import com.craisinlord.antarchy.content.network.OpenGiantFryingPanPayload;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.client.event.ClientTickEvent;
|
||||
import net.neoforged.neoforge.network.PacketDistributor;
|
||||
|
||||
@EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
|
||||
public final class GiantFryingPanClientHandler {
|
||||
private static boolean wasUse;
|
||||
|
||||
private GiantFryingPanClientHandler() {
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onClientTick(ClientTickEvent.Post event) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
LocalPlayer player = mc.player;
|
||||
if (player == null || mc.screen != null) {
|
||||
wasUse = false;
|
||||
return;
|
||||
}
|
||||
boolean use = mc.options.keyUse.isDown();
|
||||
if (use && !wasUse && player.isShiftKeyDown()
|
||||
&& (player.getMainHandItem().getItem() instanceof GiantFryingPanItem
|
||||
|| player.getOffhandItem().getItem() instanceof GiantFryingPanItem)) {
|
||||
PacketDistributor.sendToServer(OpenGiantFryingPanPayload.INSTANCE);
|
||||
}
|
||||
wasUse = use;
|
||||
}
|
||||
}
|
||||
+23
@@ -1425,11 +1425,34 @@ public final class AntarchyNeoForgeEvents {
|
||||
|
||||
if (state.is(AntarchyNeoforgeBlocks.PEACH_WOOD.get())) {
|
||||
event.setFinalState(AntarchyNeoforgeBlocks.STRIPPED_PEACH_WOOD.get().defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)));
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.is(AntarchyNeoforgeBlocks.NADIR_LOG.get())) {
|
||||
event.setFinalState(AntarchyNeoforgeBlocks.STRIPPED_NADIR_LOG.get().defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)));
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.is(AntarchyNeoforgeBlocks.NADIR_WOOD.get())) {
|
||||
event.setFinalState(AntarchyNeoforgeBlocks.STRIPPED_NADIR_WOOD.get().defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)));
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.is(AntarchyNeoforgeBlocks.ROYAL_LOG.get())) {
|
||||
event.setFinalState(AntarchyNeoforgeBlocks.STRIPPED_ROYAL_LOG.get().defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)));
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.is(AntarchyNeoforgeBlocks.ROYAL_WOOD.get())) {
|
||||
event.setFinalState(AntarchyNeoforgeBlocks.STRIPPED_ROYAL_WOOD.get().defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)));
|
||||
}
|
||||
}
|
||||
|
||||
static void onCommonSetup(FMLCommonSetupEvent event) {
|
||||
BloodCrystalShardItem.SYNC_BLOODGLASS = AntarchyNeoForgeEvents::syncBloodglass;
|
||||
if (com.craisinlord.antarchy.compat.infinity.InfinityCompat.get().isAvailable()) {
|
||||
com.craisinlord.antarchy.compat.infinity.InfinityConfigRefresh.refreshIfStale(net.neoforged.fml.loading.FMLPaths.CONFIGDIR.get());
|
||||
}
|
||||
event.enqueueWork(() -> {
|
||||
Holder<PoiType> computerPoi = BuiltInRegistries.POINT_OF_INTEREST_TYPE.getHolderOrThrow(
|
||||
ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE,
|
||||
|
||||
+9
@@ -84,6 +84,15 @@ public class AntarchyNeoforgePayloadHandlers {
|
||||
}
|
||||
})
|
||||
);
|
||||
registrar.playToServer(
|
||||
com.craisinlord.antarchy.content.network.OpenGiantFryingPanPayload.TYPE,
|
||||
com.craisinlord.antarchy.content.network.OpenGiantFryingPanPayload.STREAM_CODEC,
|
||||
(payload, ctx) -> ctx.enqueueWork(() -> {
|
||||
if (ctx.player() instanceof net.minecraft.server.level.ServerPlayer player) {
|
||||
com.craisinlord.antarchy.content.item.GiantFryingPanItem.openHeldMenu(player);
|
||||
}
|
||||
})
|
||||
);
|
||||
registrar.playToServer(
|
||||
com.craisinlord.antarchy.content.network.RoyalMountActionPayload.TYPE,
|
||||
com.craisinlord.antarchy.content.network.RoyalMountActionPayload.STREAM_CODEC,
|
||||
|
||||
@@ -35,7 +35,7 @@ displayURL="https://www.curseforge.com/minecraft/mc-mods/antarchy"
|
||||
[[dependencies.antarchy]]
|
||||
modId="antos"
|
||||
type="required"
|
||||
versionRange="*"
|
||||
versionRange="[1.2.1,)"
|
||||
ordering="AFTER"
|
||||
side="BOTH"
|
||||
|
||||
|
||||
Reference in new issue
Block a user