Skip to content

Fix client lag by removing unnecessary soil & crop validation #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MUYUTwilighter wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Fix client lag by removing unnecessary soil & crop validation #423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 33 additions & 6 deletions common/src/main/java/net/darkhax/botanypots/block/BlockEntityBotanyPot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientGamePacketListener;
Expand Down Expand Up @@ -279,9 +280,7 @@ public static void tickPot(Level level, BlockPos pos, BlockState state, BlockEnt
pot.markDirty();
}
}
}

else if (pot.growthTime != -1 || pot.doneGrowing || pot.comparatorLevel != 0) {
} else if (pot.growthTime != -1 || pot.doneGrowing || pot.comparatorLevel != 0) {

pot.resetGrowth();
}
Expand Down Expand Up @@ -315,9 +314,9 @@ public void markDirty() {

@Override
public void load(CompoundTag tag) {

super.load(tag);

if (shouldLoadSuper(tag)) {
super.load(tag);
}
this.growthTime = Serializers.INT.fromNBT(tag, "GrowthTime", 0);
this.doneGrowing = Serializers.BOOLEAN.fromNBT(tag, "DoneGrowing", false);
this.prevComparatorLevel = Serializers.INT.fromNBT(tag, "PrevComparatorLevel", 0);
Expand All @@ -328,6 +327,34 @@ public void load(CompoundTag tag) {
this.rng.setSeed(this.rngSeed);
}

/** Only load super if crops and soils are any different,
* indicating a change should be done on renderer.<br/>
* Client just need the crop and soil stacks to render BE,
* see {@link net.darkhax.botanypots.block.BotanyPotRenderer}.<br/>
* The product stacks are only needed on Pot UI,
* but data are synced in {@link BlockEntityBotanyPot#createMenu(int, Inventory)} invoked on server side.<br/>
* Also don't worry about the data reload,
* the {@link net.darkhax.botanypots.data.recipes.crop.BasicCrop} can handle that
* */
private boolean shouldLoadSuper(CompoundTag compoundTag) {
// Always load if we are on the server
if (this.getLevel() != null && !this.getLevel().isClientSide) {
return true;
}
// Does not contain inventory tag, return in case of NPE
if (!compoundTag.contains("Inventory")) {
return false;
}
// only load if crops and soils are any different
ItemStack clientSoilStack = this.getInventory().getSoilStack();
ItemStack clientCropStack = this.getInventory().getCropStack();
ListTag items = compoundTag.getCompound("Inventory").getList("Items", 10);
ItemStack serverSoilStack = ItemStack.of(items.getCompound(0));
ItemStack serverCropStack = ItemStack.of(items.getCompound(1));
return !ItemStack.isSameItemSameTags(clientCropStack, serverCropStack) ||
!ItemStack.isSameItemSameTags(clientSoilStack, serverSoilStack);
}

@Override
public void saveAdditional(CompoundTag tag) {

Expand Down