Skip to content

Commit bd5317f

Browse files
M-W-KM-W-K
committed
impl
1 parent 8fee80a commit bd5317f

File tree

90 files changed

+440
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+440
-235
lines changed

‎src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import gregtech.api.metatileentity.multiblock.ICleanroomProvider;
1313
import gregtech.api.metatileentity.multiblock.ICleanroomReceiver;
1414
import gregtech.api.metatileentity.multiblock.ParallelLogicType;
15+
import gregtech.api.network.AdvancedPacketBuffer;
1516
import gregtech.api.recipes.Recipe;
1617
import gregtech.api.recipes.RecipeBuilder;
1718
import gregtech.api.recipes.RecipeMap;
@@ -1178,13 +1179,13 @@ public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
11781179
}
11791180

11801181
@Override
1181-
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
1182+
public void writeInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
11821183
buf.writeBoolean(this.isActive);
11831184
buf.writeBoolean(this.workingEnabled);
11841185
}
11851186

11861187
@Override
1187-
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
1188+
public void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
11881189
this.isActive = buf.readBoolean();
11891190
this.workingEnabled = buf.readBoolean();
11901191
}

‎src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import gregtech.api.GTValues;
44
import gregtech.api.capability.IMultiblockController;
55
import gregtech.api.capability.IMultipleTankHandler;
6+
import gregtech.api.network.AdvancedPacketBuffer;
67
import gregtech.api.recipes.Recipe;
78
import gregtech.api.recipes.RecipeMap;
89
import gregtech.api.recipes.RecipeMaps;
@@ -275,14 +276,14 @@ public void deserializeNBT(@NotNull NBTTagCompound compound) {
275276
}
276277

277278
@Override
278-
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
279+
public void writeInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
279280
super.writeInitialSyncData(buf);
280281
buf.writeVarInt(currentHeat);
281282
buf.writeInt(lastTickSteamOutput);
282283
}
283284

284285
@Override
285-
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
286+
public void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
286287
super.receiveInitialSyncData(buf);
287288
this.currentHeat = buf.readVarInt();
288289
this.lastTickSteamOutput = buf.readInt();

‎src/main/java/gregtech/api/capability/impl/CleanroomLogic.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import gregtech.api.capability.GregtechDataCodes;
44
import gregtech.api.metatileentity.MetaTileEntity;
5+
import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
56
import gregtech.api.metatileentity.multiblock.ICleanroomProvider;
67
import gregtech.api.metatileentity.multiblock.IMaintenance;
78
import gregtech.common.ConfigHolder;
@@ -205,7 +206,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
205206
/**
206207
* writes all needed values to InitialSyncData
207208
* This MUST be called and returned in the MetaTileEntity's
208-
* {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
209+
* {@link ISyncedTileEntity#writeInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
209210
*/
210211
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
211212
buf.writeBoolean(this.isActive);
@@ -218,7 +219,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
218219
/**
219220
* reads all needed values from InitialSyncData
220221
* This MUST be called and returned in the MetaTileEntity's
221-
* {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
222+
* {@link ISyncedTileEntity#receiveInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
222223
*/
223224
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
224225
setActive(buf.readBoolean());

‎src/main/java/gregtech/api/capability/impl/FluidDrillLogic.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import gregtech.api.GTValues;
44
import gregtech.api.capability.GregtechDataCodes;
55
import gregtech.api.metatileentity.MetaTileEntity;
6+
import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
67
import gregtech.api.worldgen.bedrockFluids.BedrockFluidVeinHandler;
78
import gregtech.common.ConfigHolder;
89
import gregtech.common.metatileentities.multi.electric.MetaTileEntityFluidDrill;
@@ -281,7 +282,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
281282
/**
282283
* writes all needed values to InitialSyncData
283284
* This MUST be called and returned in the MetaTileEntity's
284-
* {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
285+
* {@link ISyncedTileEntity#writeInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
285286
*/
286287
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
287288
buf.writeBoolean(this.isActive);
@@ -294,7 +295,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
294295
/**
295296
* reads all needed values from InitialSyncData
296297
* This MUST be called and returned in the MetaTileEntity's
297-
* {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
298+
* {@link ISyncedTileEntity#receiveInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
298299
*/
299300
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
300301
setActive(buf.readBoolean());

‎src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import gregtech.api.capability.IVentable;
66
import gregtech.api.damagesources.DamageSources;
77
import gregtech.api.metatileentity.MetaTileEntity;
8+
import gregtech.api.network.AdvancedPacketBuffer;
89
import gregtech.api.recipes.Recipe;
910
import gregtech.api.recipes.RecipeMap;
1011
import gregtech.api.recipes.logic.OCParams;
@@ -111,15 +112,15 @@ public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
111112
}
112113

113114
@Override
114-
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
115+
public void writeInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
115116
super.writeInitialSyncData(buf);
116117
buf.writeByte(getVentingSide().getIndex());
117118
buf.writeBoolean(needsVenting);
118119
buf.writeBoolean(ventingStuck);
119120
}
120121

121122
@Override
122-
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
123+
public void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
123124
super.receiveInitialSyncData(buf);
124125
this.ventingSide = EnumFacing.VALUES[buf.readByte()];
125126
this.needsVenting = buf.readBoolean();

‎src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import gregtech.api.capability.GregtechDataCodes;
44
import gregtech.api.capability.IMiner;
55
import gregtech.api.metatileentity.MetaTileEntity;
6+
import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
67
import gregtech.api.recipes.Recipe;
78
import gregtech.api.recipes.RecipeMap;
89
import gregtech.api.unification.OreDictUnifier;
@@ -550,7 +551,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
550551
/**
551552
* writes all needed values to InitialSyncData
552553
* This MUST be called and returned in the MetaTileEntity's
553-
* {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
554+
* {@link ISyncedTileEntity#writeInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
554555
*/
555556
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
556557
buf.writeInt(pipeLength);
@@ -562,7 +563,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
562563
/**
563564
* reads all needed values from InitialSyncData
564565
* This MUST be called and returned in the MetaTileEntity's
565-
* {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
566+
* {@link ISyncedTileEntity#receiveInitialSyncData(gregtech.api.network.AdvancedPacketBuffer)} method
566567
*/
567568
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
568569
this.pipeLength = buf.readInt();

‎src/main/java/gregtech/api/cover/Cover.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package gregtech.api.cover;
22

3+
import gregtech.api.network.AdvancedPacketBuffer;
34
import gregtech.client.utils.BloomEffectUtil;
45

56
import net.minecraft.entity.player.EntityPlayer;
@@ -19,6 +20,7 @@
1920
import codechicken.lib.render.pipeline.IVertexOperation;
2021
import codechicken.lib.vec.Cuboid6;
2122
import codechicken.lib.vec.Matrix4;
23+
import org.jetbrains.annotations.ApiStatus;
2224
import org.jetbrains.annotations.NotNull;
2325
import org.jetbrains.annotations.Nullable;
2426
import org.jetbrains.annotations.UnknownNullability;
@@ -268,10 +270,18 @@ default void writeToNBT(@NotNull NBTTagCompound nbt) {}
268270

269271
default void readFromNBT(@NotNull NBTTagCompound nbt) {}
270272

273+
@Deprecated
274+
@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
271275
default void writeInitialSyncData(@NotNull PacketBuffer packetBuffer) {}
272276

277+
@Deprecated
278+
@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
273279
default void readInitialSyncData(@NotNull PacketBuffer packetBuffer) {}
274280

281+
default void writeInitialSyncData(@NotNull AdvancedPacketBuffer packetBuffer) {}
282+
283+
default void readInitialSyncData(@NotNull AdvancedPacketBuffer packetBuffer) {}
284+
275285
default void writeCustomData(int discriminator, @NotNull Consumer<@NotNull PacketBuffer> buf) {
276286
getCoverableView().writeCoverData(this, discriminator, buf);
277287
}

‎src/main/java/gregtech/api/cover/CoverSaveHandler.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package gregtech.api.cover;
22

33
import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
4+
import gregtech.api.network.AdvancedPacketBuffer;
45
import gregtech.api.util.GTLog;
56

67
import net.minecraft.nbt.NBTTagCompound;
@@ -24,7 +25,7 @@ private CoverSaveHandler() {}
2425
* @param buf the buf to write to
2526
* @param coverableView the CoverableView containing the covers
2627
*/
27-
public static void writeInitialSyncData(@NotNull PacketBuffer buf, @NotNull CoverableView coverableView) {
28+
public static void writeInitialSyncData(@NotNull AdvancedPacketBuffer buf, @NotNull CoverableView coverableView) {
2829
Cover[] covers = new Cover[EnumFacing.VALUES.length];
2930
int count = 0;
3031
for (EnumFacing facing : EnumFacing.VALUES) {
@@ -42,7 +43,8 @@ public static void writeInitialSyncData(@NotNull PacketBuffer buf, @NotNull Cove
4243
Cover cover = covers[i];
4344
buf.writeByte(cover.getAttachedSide().ordinal());
4445
buf.writeVarInt(CoverDefinition.getNetworkIdForCover(cover.getDefinition()));
45-
cover.writeInitialSyncData(buf);
46+
cover.writeInitialSyncData(buf.openSubBuffer());
47+
buf.writeSubBuffer();
4648
}
4749
}
4850

@@ -52,7 +54,7 @@ public static void writeInitialSyncData(@NotNull PacketBuffer buf, @NotNull Cove
5254
* @param buf the buf to read from
5355
* @param coverHolder the CoverHolder containing the covers
5456
*/
55-
public static void receiveInitialSyncData(@NotNull PacketBuffer buf, @NotNull CoverHolder coverHolder) {
57+
public static void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf, @NotNull CoverHolder coverHolder) {
5658
final int count = buf.readByte();
5759
if (count == 0) return;
5860

@@ -66,8 +68,10 @@ public static void receiveInitialSyncData(@NotNull PacketBuffer buf, @NotNull Co
6668
coverHolder.getPos());
6769
} else {
6870
Cover cover = definition.createCover(coverHolder, facing);
69-
cover.readInitialSyncData(buf);
70-
ISyncedTileEntity.checkInitialData(buf, cover);
71+
AdvancedPacketBuffer b = buf.readSubBuffer();
72+
cover.readInitialSyncData(b);
73+
ISyncedTileEntity.checkInitialData(b, cover);
74+
buf.closeSubBuffer();
7175
coverHolder.addCover(facing, cover);
7276
}
7377
}

‎src/main/java/gregtech/api/metatileentity/MTETrait.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import it.unimi.dsi.fastutil.objects.Object2IntFunction;
1111
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
12-
import org.jetbrains.annotations.ApiStatus;
1312
import org.jetbrains.annotations.NotNull;
1413

1514
import java.util.function.Consumer;
@@ -77,34 +76,6 @@ public NBTTagCompound serializeNBT() {
7776

7877
public void deserializeNBT(@NotNull NBTTagCompound compound) {}
7978

80-
@Override
81-
public void writeInitialSyncData(@NotNull PacketBuffer buf) {}
82-
83-
/**
84-
* Deprecated since 2.8 and will be removed in 2.9.
85-
*
86-
* @deprecated Use {@link #writeInitialSyncData(PacketBuffer)}
87-
*/
88-
@ApiStatus.ScheduledForRemoval(inVersion = "2.9")
89-
@Deprecated
90-
public void writeInitialData(@NotNull PacketBuffer buffer) {
91-
writeInitialSyncData(buffer);
92-
}
93-
94-
@Override
95-
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {}
96-
97-
/**
98-
* Deprecated since 2.8 and will be removed in 2.9.
99-
*
100-
* @deprecated use {@link #receiveInitialSyncData(PacketBuffer)}
101-
*/
102-
@ApiStatus.ScheduledForRemoval(inVersion = "2.9")
103-
@Deprecated
104-
public void receiveInitialData(@NotNull PacketBuffer buffer) {
105-
receiveInitialSyncData(buffer);
106-
}
107-
10879
@Override
10980
public void receiveCustomData(int discriminator, @NotNull PacketBuffer buf) {}
11081

‎src/main/java/gregtech/api/metatileentity/MetaTileEntity.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import gregtech.api.mui.GTGuiTheme;
2929
import gregtech.api.mui.GregTechGuiScreen;
3030
import gregtech.api.mui.factory.MetaTileEntityGuiFactory;
31+
import gregtech.api.network.AdvancedPacketBuffer;
3132
import gregtech.api.recipes.RecipeMap;
3233
import gregtech.api.util.GTLog;
3334
import gregtech.api.util.GTTransferUtils;
@@ -1017,13 +1018,14 @@ public int getHarvestLevel() {
10171018
}
10181019

10191020
@Override
1020-
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
1021+
public void writeInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
10211022
buf.writeByte(this.frontFacing.getIndex());
10221023
buf.writeInt(this.paintingColor);
10231024
buf.writeShort(this.mteTraitByNetworkId.size());
10241025
for (Int2ObjectMap.Entry<MTETrait> entry : mteTraitByNetworkId.int2ObjectEntrySet()) {
10251026
buf.writeVarInt(entry.getIntKey());
1026-
entry.getValue().writeInitialData(buf);
1027+
entry.getValue().writeInitialSyncData(buf.openSubBuffer());
1028+
buf.writeSubBuffer();
10271029
}
10281030
CoverSaveHandler.writeInitialSyncData(buf, this);
10291031
buf.writeBoolean(muffled);
@@ -1034,7 +1036,7 @@ public boolean isPainted() {
10341036
}
10351037

10361038
@Override
1037-
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
1039+
public void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
10381040
this.frontFacing = EnumFacing.VALUES[buf.readByte()];
10391041
this.paintingColor = buf.readInt();
10401042
int amountOfTraits = buf.readShort();
@@ -1044,8 +1046,10 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
10441046
if (trait == null) {
10451047
GTLog.logger.warn("Could not find MTETrait for id: {} at position {}.", traitNetworkId, getPos());
10461048
} else {
1047-
trait.receiveInitialSyncData(buf);
1048-
ISyncedTileEntity.checkInitialData(buf, trait);
1049+
AdvancedPacketBuffer b = buf.readSubBuffer();
1050+
trait.receiveInitialSyncData(b);
1051+
ISyncedTileEntity.checkInitialData(b, trait);
1052+
buf.closeSubBuffer();
10491053
}
10501054
}
10511055
CoverSaveHandler.receiveInitialSyncData(buf, this);

0 commit comments

Comments
 (0)