Skip to content

Commit 7740330

Browse files
committed
clean out mte holder
should theoretically still work if anyone extended the class clean up GTBaseTileEntity
1 parent 21c12b1 commit 7740330

File tree

3 files changed

+54
-400
lines changed

3 files changed

+54
-400
lines changed

src/main/java/gregtech/api/metatileentity/GTBaseTileEntity.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,12 @@ protected void addAdditionalData(NBTTagCompound updateTag) {
217217
@Override
218218
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
219219
buf.writeString(getName());
220-
// below this might not be necessary anymore ?
221-
buf.writeBoolean(true);
222-
buf.writeVarInt(getRegistry().getNetworkId());
223-
buf.writeVarInt(getRegistry().getIdByObjectName(getMetaID()));
224220
writeInitialSyncDataMTE(buf);
225221
}
226222

227223
@Override
228224
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
229225
setCustomName(buf.readString(Short.MAX_VALUE));
230-
buf.readBoolean();
231226
receiveMTEInitializationData(buf);
232227
}
233228

@@ -244,10 +239,8 @@ public void receiveCustomData(int discriminator, @NotNull PacketBuffer buffer) {
244239
* @param buf the buffer to read data from
245240
*/
246241
private void receiveMTEInitializationData(@NotNull PacketBuffer buf) {
247-
int networkId = buf.readVarInt();
248-
int metaTileEntityId = buf.readVarInt();
249-
this.onPlacement();
250242
this.receiveInitialSyncDataMTE(buf);
243+
this.onPlacement();
251244
scheduleRenderUpdate();
252245
this.needToUpdateLightning = true;
253246
}
@@ -338,7 +331,7 @@ public boolean shouldRenderInPass(int pass) {
338331
@NotNull
339332
@Override
340333
public AxisAlignedBB getRenderBoundingBox() {
341-
if (this instanceof IFastRenderMetaTileEntity fastRender) {
334+
if (getMetaTileEntity() instanceof IFastRenderMetaTileEntity fastRender) {
342335
return fastRender.getRenderBoundingBox();
343336
}
344337
return new AxisAlignedBB(getPos());
@@ -541,11 +534,7 @@ public DimensionalCoord getLocation() {
541534

542535
@Override
543536
@Optional.Method(modid = Mods.Names.APPLIED_ENERGISTICS2)
544-
public void gridChanged() {
545-
// if (metaTileEntity != null) {
546-
// metaTileEntity.gridChanged();
547-
// }
548-
}
537+
public void gridChanged() {}
549538

550539
@Optional.Method(modid = Mods.Names.APPLIED_ENERGISTICS2)
551540
public void readFromNBT_AENetwork(NBTTagCompound data) {

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ public abstract class MetaTileEntity extends GTBaseTileEntity
178178

179179
protected MetaTileEntity(@NotNull ResourceLocation metaTileEntityId) {
180180
this.metaTileEntityId = metaTileEntityId;
181+
this.holder = this;
181182
this.registry = GregTechAPI.mteManager.getRegistry(metaTileEntityId.getNamespace());
182183
initializeInventory();
183184
}
@@ -194,8 +195,9 @@ protected void initializeInventory() {
194195

195196
// todo remove this
196197
@Deprecated
198+
@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
197199
public IGregTechTileEntity getHolder() {
198-
return this;
200+
return this.holder;
199201
}
200202

201203
@Deprecated
@@ -1229,11 +1231,6 @@ public final void setOutputRedstoneSignal(EnumFacing side, int strength) {
12291231
}
12301232
}
12311233

1232-
@Override
1233-
public void notifyBlockUpdate() {
1234-
if (holder != null) holder.notifyBlockUpdate();
1235-
}
1236-
12371234
@Override
12381235
public void scheduleRenderUpdate() {
12391236
super.scheduleRenderUpdate(); // this call is required

0 commit comments

Comments
 (0)