Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

amethyst dust now makes scrolls have the offset marks

Browse source
This commit is contained in:
gamma-delta 2022-11-14 20:35:48 -06:00
parent f42b44f029
commit 03dd09c6de
5 changed files with 94 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Common/src/main/java/at/petrak/hexcasting/client/entity/WallScrollRenderer.java
View file

@ -121,7 +121,8 @@ public class WallScrollRenderer extends EntityRenderer<EntityWallScroll> {
ps.translate(0, 0, 0.01);
theCoolerDrawLineSeq(mat, norm, light, verts, points, wallScroll.blockSize * 2f / 3f, inner);
if (wallScroll.getShowsStartPos()) {
if (wallScroll.getShowsStrokeOrder()) {
ps.translate(0, 0, 0.01);
var spotFrac = 0.8f * wallScroll.blockSize;
theCoolerDrawSpot(mat, norm, light, verts, points.get(0), 2f / 3f * spotFrac,
0xff_5b7bd7);

69
Common/src/main/java/at/petrak/hexcasting/common/entities/EntityWallScroll.java
View file

@ -8,6 +8,7 @@ import at.petrak.hexcasting.common.items.ItemScroll;
import at.petrak.hexcasting.common.lib.HexItems;
import at.petrak.hexcasting.common.lib.HexSounds;
import at.petrak.hexcasting.common.network.MsgNewWallScrollAck;
import at.petrak.hexcasting.common.network.MsgRecalcWallScrollDisplayAck;
import at.petrak.hexcasting.xplat.IXplatAbstractions;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@ -17,6 +18,7 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand;
@ -35,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
public class EntityWallScroll extends HangingEntity {
private static final EntityDataAccessor<Boolean> SHOWS_START_POS = SynchedEntityData.defineId(
private static final EntityDataAccessor<Boolean> SHOWS_STROKE_ORDER = SynchedEntityData.defineId(
EntityWallScroll.class,
EntityDataSerializers.BOOLEAN);
@ -55,15 +57,14 @@ public class EntityWallScroll extends HangingEntity {
super(HexEntities.WALL_SCROLL, world, pos);
this.setDirection(dir);
this.blockSize = blockSize;
this.setShowsStartPos(showStrokeOrder);
this.loadDataFromScrollItem(scroll);
this.entityData.set(SHOWS_STROKE_ORDER, showStrokeOrder);
this.scroll = scroll;
this.recalculateDisplay();
this.recalculateBoundingBox();
}
private void loadDataFromScrollItem(ItemStack scroll) {
this.scroll = scroll;
public void recalculateDisplay() {
CompoundTag patternTag = NBTHelper.getCompound(scroll, ItemScroll.TAG_PATTERN);
if (patternTag != null) {
this.pattern = HexPattern.fromNBT(patternTag);
@ -71,8 +72,8 @@ public class EntityWallScroll extends HangingEntity {
var pair = RenderLib.getCenteredPattern(pattern, 128f / 3 * blockSize, 128f / 3 * blockSize,
16f / 3 * blockSize);
var dots = pair.getSecond();
this.zappyPoints = RenderLib.makeZappy(dots, RenderLib.findDupIndices(pattern.positions()), 10f, 0.8f,
0f, 0f);
this.zappyPoints = RenderLib.makeZappy(dots, RenderLib.findDupIndices(pattern.positions()), 10, 0.4f,
0f, 0f, this.getShowsStrokeOrder() ? 0.2f : 0f);
}
this.isAncient = NBTHelper.hasString(scroll, ItemScroll.TAG_OP_ID);
@ -86,15 +87,15 @@ public class EntityWallScroll extends HangingEntity {
@Override
protected void defineSynchedData() {
super.defineSynchedData();
this.entityData.define(SHOWS_START_POS, false);
this.entityData.define(SHOWS_STROKE_ORDER, false);
}
public boolean getShowsStartPos() {
return this.entityData.get(SHOWS_START_POS);
public boolean getShowsStrokeOrder() {
return this.entityData.get(SHOWS_STROKE_ORDER);
}
public void setShowsStartPos(boolean b) {
this.entityData.set(SHOWS_START_POS, b);
public void setShowsStrokeOrder(boolean b) {
this.entityData.set(SHOWS_STROKE_ORDER, b);
}
@Override
@ -124,13 +125,21 @@ public class EntityWallScroll extends HangingEntity {
@Override
public InteractionResult interactAt(Player pPlayer, Vec3 pVec, InteractionHand pHand) {
var handStack = pPlayer.getItemInHand(pHand);
if (handStack.is(HexItems.AMETHYST_DUST) && !this.getShowsStartPos()) {
if (handStack.is(HexItems.AMETHYST_DUST) && !this.getShowsStrokeOrder()) {
if (!pPlayer.getAbilities().instabuild) {
handStack.shrink(1);
}
this.setShowsStartPos(true);
this.setShowsStrokeOrder(true);
pPlayer.level.playSound(pPlayer, this, HexSounds.SCROLL_DUST, SoundSource.PLAYERS, 1f, 1f);
if (pPlayer.getLevel() instanceof ServerLevel slevel) {
IXplatAbstractions.INSTANCE.sendPacketNear(this.position(), 32.0, slevel,
new MsgRecalcWallScrollDisplayAck(this.getId(), true));
} else {
// Beat the packet roundtrip to the punch to get a quicker visual
this.recalculateDisplay();
}
return InteractionResult.SUCCESS;
}
return super.interactAt(pPlayer, pVec, pHand);
@ -145,25 +154,27 @@ public class EntityWallScroll extends HangingEntity {
public Packet<?> getAddEntityPacket() {
return IXplatAbstractions.INSTANCE.toVanillaClientboundPacket(
new MsgNewWallScrollAck(new ClientboundAddEntityPacket(this),
pos, direction, scroll, getShowsStartPos(), blockSize));
pos, direction, scroll, getShowsStrokeOrder(), blockSize));
}
public void readSpawnData(BlockPos pos, Direction dir, ItemStack scrollItem,
boolean showsStrokeOrder, int blockSize) {
this.pos = pos;
this.setDirection(dir);
this.setShowsStartPos(showsStrokeOrder);
this.scroll = scrollItem;
this.blockSize = blockSize;
this.setDirection(dir);
this.setShowsStrokeOrder(showsStrokeOrder);
this.recalculateDisplay();
this.recalculateBoundingBox();
this.loadDataFromScrollItem(scrollItem);
}
@Override
public void addAdditionalSaveData(CompoundTag tag) {
tag.putByte("direction", (byte) this.direction.ordinal());
tag.put("scroll", HexUtils.serializeToNBT(this.scroll));
tag.putBoolean("showsStrokeOrder", this.getShowsStartPos());
tag.putBoolean("showsStrokeOrder", this.getShowsStrokeOrder());
tag.putInt("blockSize", this.blockSize);
super.addAdditionalSaveData(tag);
}
@ -171,18 +182,16 @@ public class EntityWallScroll extends HangingEntity {
@Override
public void readAdditionalSaveData(CompoundTag tag) {
this.direction = Direction.values()[tag.getByte("direction")];
var scroll = ItemStack.of(tag.getCompound("scroll"));
this.setShowsStartPos(tag.getBoolean("showsStrokeOrder"));
if (tag.contains("blockSize")) {
this.blockSize = tag.getInt("blockSize");
} else {
this.blockSize = 3;
}
this.scroll = ItemStack.of(tag.getCompound("scroll"));
this.blockSize = tag.getInt("blockSize");
this.setDirection(this.direction);
this.setShowsStrokeOrder(tag.getBoolean("showsStrokeOrder"));
this.recalculateDisplay();
this.recalculateBoundingBox();
super.readAdditionalSaveData(tag);
this.setDirection(this.direction);
this.loadDataFromScrollItem(scroll);
this.recalculateBoundingBox();
}
@Override

48
Common/src/main/java/at/petrak/hexcasting/common/network/MsgRecalcWallScrollDisplayAck.java Normal file
View file

@ -0,0 +1,48 @@
package at.petrak.hexcasting.common.network;
import at.petrak.hexcasting.common.entities.EntityWallScroll;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import static at.petrak.hexcasting.api.HexAPI.modLoc;
/**
* Sent S->C to have a wall scroll recalculate its pattern, to get readability offset.
*/
public record MsgRecalcWallScrollDisplayAck(int entityId, boolean showStrokeOrder) implements IMessage {
public static final ResourceLocation ID = modLoc("redoscroll");
public static MsgRecalcWallScrollDisplayAck deserialize(ByteBuf buffer) {
var buf = new FriendlyByteBuf(buffer);
var id = buf.readVarInt();
var showStrokeOrder = buf.readBoolean();
return new MsgRecalcWallScrollDisplayAck(id, showStrokeOrder);
}
@Override
public void serialize(FriendlyByteBuf buf) {
buf.writeVarInt(entityId);
buf.writeBoolean(showStrokeOrder);
}
@Override
public ResourceLocation getFabricId() {
return ID;
}
public static void handle(MsgRecalcWallScrollDisplayAck msg) {
Minecraft.getInstance().execute(new Runnable() {
@Override
public void run() {
var mc = Minecraft.getInstance();
var entity = mc.level.getEntity(msg.entityId);
if (entity instanceof EntityWallScroll scroll
&& scroll.getShowsStrokeOrder() != msg.showStrokeOrder) {
scroll.recalculateDisplay();
}
}
});
}
}

2
Fabric/src/main/java/at/petrak/hexcasting/fabric/network/FabricPacketHandler.java
View file

@ -39,6 +39,8 @@ public class FabricPacketHandler {
makeClientBoundHandler(MsgUpdateComparatorVisualsAck::deserialize, MsgUpdateComparatorVisualsAck::handle));
ClientPlayNetworking.registerGlobalReceiver(MsgNewWallScrollAck.ID,
makeClientBoundHandler(MsgNewWallScrollAck::deserialize, MsgNewWallScrollAck::handle));
ClientPlayNetworking.registerGlobalReceiver(MsgRecalcWallScrollDisplayAck.ID,
makeClientBoundHandler(MsgRecalcWallScrollDisplayAck::deserialize, MsgRecalcWallScrollDisplayAck::handle));
}
private static <T> ClientPlayNetworking.PlayChannelHandler makeClientBoundHandler(

3
Forge/src/main/java/at/petrak/hexcasting/forge/network/ForgePacketHandler.java
View file

@ -61,6 +61,9 @@ public class ForgePacketHandler {
MsgNewWallScrollAck::serialize,
MsgNewWallScrollAck::deserialize,
makeClientBoundHandler(MsgNewWallScrollAck::handle));
NETWORK.registerMessage(messageIdx++, MsgRecalcWallScrollDisplayAck.class,
MsgRecalcWallScrollDisplayAck::serialize,
MsgRecalcWallScrollDisplayAck::deserialize, makeClientBoundHandler(MsgRecalcWallScrollDisplayAck::handle));
}
private static <T> BiConsumer<T, Supplier<NetworkEvent.Context>> makeServerBoundHandler(