Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false
id "com.github.johnrengelman.shadow" version "7.1.2" apply false
}

Expand All @@ -21,10 +21,10 @@ subprojects {

mappings loom.layered() {

it.parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}")
it.officialMojangMappings {
setNameSyntheticMembers(false)
}
it.parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}")
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ loom {

dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modImplementation("curse.maven:selene-499980:5726768")
implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.3.6"))

modImplementation("curse.maven:selene-499980:6838880")
modImplementation "dev.emi:emi-xplat-intermediary:${rootProject.emi_version}:api"
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/ordana/spelunkery/Spelunkery.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void commonInit() {
}
initiated = true;

NetworkHandler.registerMessages();
NetworkHandler.init();
CommonConfigs.init();

PlatHelper.addCommonSetup(Spelunkery::setup);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

public class NetworkHandler {

public static final ChannelHandler CHANNEL = ChannelHandler.createChannel(Spelunkery.res("network"));
public static final ChannelHandler CHANNEL = ChannelHandler.builder(Spelunkery.MOD_ID)
.register(NetworkDir.PLAY_TO_CLIENT,
ClientBoundSendKnockbackPacket.class, ClientBoundSendKnockbackPacket::new)
.register(NetworkDir.PLAY_TO_CLIENT,
ClientBoundParticlePacket.class, ClientBoundParticlePacket::new)
.build();

public static void registerMessages() {
CHANNEL.register(NetworkDir.PLAY_TO_CLIENT,
ClientBoundSendKnockbackPacket.class, ClientBoundSendKnockbackPacket::new);

CHANNEL.register(NetworkDir.PLAY_TO_CLIENT,
ClientBoundParticlePacket.class, ClientBoundParticlePacket::new);
public static void init() {
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public <T extends LivingEntity> boolean poseRightArm(ItemStack itemStack, Humano
}

@Override
public void animateItemFirstPerson(LivingEntity entity, ItemStack stack, InteractionHand hand, PoseStack poseStack, float partialTicks, float pitch, float attackAnim, float handHeight) {
public void animateItemFirstPerson(Player entity, ItemStack stack, InteractionHand hand, HumanoidArm arm, PoseStack poseStack, float partialTicks, float pitch, float attackAnim, float handHeight) {
//is using item
if (tolling && entity.getUsedItemHand() == hand && entity.level() instanceof ClientLevel level) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public <T extends LivingEntity> boolean poseRightArm(ItemStack itemStack, Humano
}

@Override
public void animateItemFirstPerson(LivingEntity entity, ItemStack stack, InteractionHand hand, PoseStack matrixStack, float partialTicks, float pitch, float attackAnim, float handHeight) {
public void animateItemFirstPerson(Player entity, ItemStack stack, InteractionHand hand, HumanoidArm arm, PoseStack poseStack, float partialTicks, float pitch, float attackAnim, float handHeight) {
//is using item
if (entity.isUsingItem() && entity.getUseItemRemainingTicks() > 0 && entity.getUsedItemHand() == hand &&
entity.getTicksUsingItem() < 60) {
Expand All @@ -257,10 +257,10 @@ public void animateItemFirstPerson(LivingEntity entity, ItemStack stack, Interac
float f15 = Mth.sin((timeLeft - 0.1F) * 1.3F);
float f18 = f12 - 0.1F;
float f20 = f15 * f18;
matrixStack.translate(0, f20 * 0.007F, 0);
poseStack.translate(0, f20 * 0.007F, 0);

matrixStack.translate(0, 0, f12 * 0.04F);
matrixStack.scale(1.0F, 1.0F, 1.0F + f12 * 0.2F);
poseStack.translate(0, 0, f12 * 0.04F);
poseStack.scale(1.0F, 1.0F, 1.0F + f12 * 0.2F);
//matrixStack.mulPose(Vector3f.YN.rotationDegrees((float)k * 45.0F));
}
}
Expand Down
Loading