Skip to content

Commit 8784aa0

Browse files
committed
Move MachineRenderState to api/machine package
Fixes dedicated server crash caused by client-side class loading. MachineRenderState was in client/model/machine but used by server-side code (MetaMachineBlockEntity, MachineRenderStatePayload, etc.). When the dedicated server loaded these classes, it triggered loading of other client-only classes in that package, causing LDLRegisterClient and GuiGraphics class loading errors.
1 parent 1c569cf commit 8784aa0

30 files changed

+27
-30
lines changed

src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.gregtechceu.gtceu.api.GTValues;
44
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
55
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
6+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
67
import com.gregtechceu.gtceu.api.machine.MetaMachine;
7-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
88

99
import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
1010
import com.lowdragmc.lowdraglib.syncdata.IManaged;

src/main/java/com/gregtechceu/gtceu/api/machine/IMachineBlockEntity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.gregtechceu.gtceu.api.block.IMachineBlock;
55
import com.gregtechceu.gtceu.api.blockentity.IPaintable;
66
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighLight;
7-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
87
import com.gregtechceu.gtceu.core.mixins.LevelAccessor;
98

109
import com.lowdragmc.lowdraglib.syncdata.blockentity.IAsyncAutoSyncBlockEntity;

src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
99
import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe;
1010
import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier;
11-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
1211

1312
import com.lowdragmc.lowdraglib.utils.ShapeUtils;
1413

src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineRenderState.java renamed to src/main/java/com/gregtechceu/gtceu/api/machine/MachineRenderState.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package com.gregtechceu.gtceu.client.model.machine;
1+
package com.gregtechceu.gtceu.api.machine;
22

3-
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
4-
import com.gregtechceu.gtceu.api.machine.MetaMachine;
53
import com.gregtechceu.gtceu.api.registry.GTRegistries;
64

75
import net.minecraft.world.level.block.state.StateHolder;

src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.gregtechceu.gtceu.api.misc.IOFluidHandlerList;
2525
import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection;
2626
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
27-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
2827
import com.gregtechceu.gtceu.client.util.ModelUtils;
2928
import com.gregtechceu.gtceu.common.cover.FluidFilterCover;
3029
import com.gregtechceu.gtceu.common.cover.ItemFilterCover;

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties;
66
import com.gregtechceu.gtceu.api.capability.IParallelHatch;
77
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
8+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
89
import com.gregtechceu.gtceu.api.machine.MetaMachine;
910
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
1011
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController;
1112
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
1213
import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
1314
import com.gregtechceu.gtceu.api.multiblock.MultiblockState;
1415
import com.gregtechceu.gtceu.api.multiblock.MultiblockWorldSavedData;
15-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
1616

1717
import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;
1818
import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler;
77
import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
88
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
9+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
910
import com.gregtechceu.gtceu.api.machine.feature.ICleanroomProvider;
1011
import com.gregtechceu.gtceu.api.machine.feature.IMufflableMachine;
1112
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
@@ -17,7 +18,6 @@
1718
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
1819
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
1920
import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe;
20-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
2121

2222
import com.lowdragmc.lowdraglib.syncdata.ISubscription;
2323
import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/part/MultiblockPartMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import com.gregtechceu.gtceu.api.capability.recipe.IO;
44
import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler;
55
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
6+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
67
import com.gregtechceu.gtceu.api.machine.MetaMachine;
78
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController;
89
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
910
import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
1011
import com.gregtechceu.gtceu.api.machine.trait.IRecipeHandlerTrait;
1112
import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
12-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
1313

1414
import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;
1515
import com.lowdragmc.lowdraglib.syncdata.annotation.RequireRerender;

src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.gregtechceu.gtceu.api.gui.UITemplate;
99
import com.gregtechceu.gtceu.api.gui.widget.PredicatedImageWidget;
1010
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
11+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
1112
import com.gregtechceu.gtceu.api.machine.MetaMachine;
1213
import com.gregtechceu.gtceu.api.machine.feature.IExhaustVentMachine;
1314
import com.gregtechceu.gtceu.api.machine.feature.IUIMachine;
@@ -20,7 +21,6 @@
2021
import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe;
2122
import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction;
2223
import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier;
23-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
2424
import com.gregtechceu.gtceu.common.recipe.condition.VentCondition;
2525

2626
import com.lowdragmc.lowdraglib.gui.modular.ModularUI;

src/main/java/com/gregtechceu/gtceu/api/machine/trait/MachineTrait.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.gregtechceu.gtceu.api.machine.trait;
22

3+
import com.gregtechceu.gtceu.api.machine.MachineRenderState;
34
import com.gregtechceu.gtceu.api.machine.MetaMachine;
4-
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
55

66
import com.lowdragmc.lowdraglib.syncdata.IEnhancedManaged;
77
import com.lowdragmc.lowdraglib.syncdata.field.FieldManagedStorage;

0 commit comments

Comments
 (0)