Skip to content

Commit

Permalink
update neptune
Browse files Browse the repository at this point in the history
  • Loading branch information
IAFEnvoy committed Jan 8, 2025
1 parent 90b68e5 commit cad9528
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 18 deletions.
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury:${rootProject.architectury_version}"

modImplementation "maven.modrinth:neptune:VlsOaad4"
modImplementation "maven.modrinth:neptune:iodOKC77"
modImplementation "maven.modrinth:jupiter:nhqjUZZy"

modImplementation "com.github.apace100:origins-fabric:${project.origins_version}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package com.iafenvoy.sow.item.block.entity;

import com.iafenvoy.neptune.network.ClientNetworkHelper;
import com.iafenvoy.sow.data.ArdoniType;
import com.iafenvoy.sow.item.block.ArdoniGraveBlock;
import com.iafenvoy.sow.registry.SowBlockEntities;
import com.iafenvoy.sow.registry.SowBlocks;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import org.jetbrains.annotations.Nullable;

import java.util.Locale;

Expand Down Expand Up @@ -82,9 +83,7 @@ public boolean activated() {
return this.getCachedState().get(ArdoniGraveBlock.ACTIVATED);
}

@Environment(EnvType.CLIENT)
public float getRotationDegree() {
if (!this.fulfulled) ClientNetworkHelper.requestBlockEntityData(this.pos);
return -this.getCachedState().get(ArdoniGraveBlock.FACING).asRotation() + 180;
}

Expand All @@ -106,4 +105,15 @@ public static ItemStack buildGrave(Identifier texture) {
stack.setSubNbt("BlockEntityTag", nbt);
return stack;
}

@Nullable
@Override
public Packet<ClientPlayPacketListener> toUpdatePacket() {
return BlockEntityUpdateS2CPacket.create(this);
}

@Override
public NbtCompound toInitialChunkDataNbt() {
return this.createNbt();
}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
package com.iafenvoy.sow.item.block.entity;

import com.iafenvoy.neptune.ServerHelper;
import com.iafenvoy.neptune.network.ClientNetworkHelper;
import com.iafenvoy.neptune.network.ServerNetworkHelper;
import com.iafenvoy.sow.SongsOfWar;
import com.iafenvoy.sow.registry.SowBlockEntities;
import com.iafenvoy.sow.util.BookUtils;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtList;
import net.minecraft.nbt.NbtOps;
import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import org.jetbrains.annotations.Nullable;

import java.util.function.Consumer;
import java.util.function.Supplier;
Expand All @@ -44,11 +45,6 @@ protected void writeNbt(NbtCompound nbt) {
nbt.put("content", WotContents.CODEC.encodeStart(NbtOps.INSTANCE, this.contents).resultOrPartial(SongsOfWar.LOGGER::error).orElse(new NbtCompound()));
}

@Environment(EnvType.CLIENT)
public void checkIfFulfilled(){
if (!this.fulfilled) ClientNetworkHelper.requestBlockEntityData(this.pos);
}

public WotContents getContents() {
return this.contents;
}
Expand All @@ -59,6 +55,17 @@ public void sync() {
ServerNetworkHelper.sendBlockEntityData(player, this.pos, this);
}

@Nullable
@Override
public Packet<ClientPlayPacketListener> toUpdatePacket() {
return BlockEntityUpdateS2CPacket.create(this);
}

@Override
public NbtCompound toInitialChunkDataNbt() {
return this.createNbt();
}

public static final class WotContents {
public static final Supplier<WotContents> EMPTY = () -> new WotContents(Direction.EAST, ItemStack.EMPTY, 0, 0, 1, 1);
public static final Codec<WotContents> CODEC = RecordCodecBuilder.create(i -> i.group(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public WallsOfTimeBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
@Override
public void render(WallsOfTimeBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
matrices.push();
entity.checkIfFulfilled();
WallsOfTimeBlockEntity.WotContents contents = entity.getContents();
matrices.translate(0.5, 0.5, 0.5);
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180 - contents.getDirection().getHorizontal() * 90));
Expand Down
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }

modImplementation "dev.emi:trinkets:${trinkets_version}"
modImplementation "maven.modrinth:neptune:VlsOaad4"
modImplementation "maven.modrinth:neptune:iodOKC77"
modImplementation "maven.modrinth:jupiter:nhqjUZZy"

modApi(include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}"))
Expand Down
2 changes: 1 addition & 1 deletion forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
// Curios
modImplementation "top.theillusivec4.curios:curios-forge:${curios_version}"

modImplementation "maven.modrinth:neptune:x91KIxMv"
modImplementation "maven.modrinth:neptune:Ompk282D"
modImplementation "maven.modrinth:jupiter:quscWB5K"

// Optional
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ minecraft_version=1.20.1
enabled_platforms=fabric,forge
yarn_mappings=1.20.1+build.10
archives_base_name=SongsOfWar
mod_version=0.8.1
mod_version=0.8.2
maven_group=com.iafenvoy
architectury_version=9.2.14
fabric_loader_version=0.15.11
Expand Down

0 comments on commit cad9528

Please sign in to comment.