Skip to content

Commit c46891c

Browse files
modmuss50modmuss50
committed
Test fixes
1 parent 0bc26b9 commit c46891c

9 files changed

Lines changed: 51 additions & 53 deletions

File tree

‎fabric-game-rule-api-v1/src/test/java/net/fabricmc/fabric/test/gamerule/MinecraftGameRuleServiceImplTest.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.intellij.lang.annotations.Language;
3030
import org.junit.jupiter.api.Assertions;
3131
import org.junit.jupiter.api.BeforeAll;
32+
import org.junit.jupiter.api.BeforeEach;
3233
import org.junit.jupiter.api.Test;
3334

3435
import net.minecraft.SharedConstants;
@@ -41,6 +42,7 @@
4142
import net.minecraft.server.jsonrpc.internalapi.MinecraftGameRuleServiceImpl;
4243
import net.minecraft.server.jsonrpc.methods.ClientInfo;
4344
import net.minecraft.server.jsonrpc.methods.GameRulesService;
45+
import net.minecraft.server.notifications.NotificationManager;
4446
import net.minecraft.world.flag.FeatureFlagSet;
4547
import net.minecraft.world.level.gamerules.GameRule;
4648
import net.minecraft.world.level.gamerules.GameRules;
@@ -58,10 +60,19 @@ static void bootstrap() {
5860
private static final JsonRpcLogger MANAGEMENT_LOGGER = new JsonRpcLogger();
5961
private final GameRules gameRules = new GameRules(FeatureFlagSet.of());
6062

63+
DedicatedServer server;
64+
NotificationManager notificationManager;
65+
66+
@BeforeEach
67+
void setUp() {
68+
server = mockServer();
69+
notificationManager = new NotificationManager();
70+
notificationManager.setServer(server);
71+
}
72+
6173
@Test
6274
void testUpdateDouble() {
63-
DedicatedServer server = mockServer();
64-
MinecraftGameRuleService service = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
75+
MinecraftGameRuleService service = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
6576

6677
GameRulesService.GameRuleUpdate<Double> result = service.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.ONE_TO_TEN_DOUBLE, 5.5D), CONNECTION_ID);
6778

@@ -76,8 +87,7 @@ void testUpdateDouble() {
7687

7788
@Test
7889
void testFabricId() {
79-
DedicatedServer server = mockServer();
80-
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
90+
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
8191

8292
GameRulesService.GameRuleUpdate<Boolean> result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.RED_BOOLEAN, false), CONNECTION_ID);
8393

@@ -88,8 +98,7 @@ void testFabricId() {
8898

8999
@Test
90100
void testUpdateEnum() {
91-
DedicatedServer server = mockServer();
92-
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
101+
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
93102

94103
GameRulesService.GameRuleUpdate<Direction> result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.CARDINAL_DIRECTION_ENUM_RULE, Direction.EAST), CONNECTION_ID);
95104

@@ -105,8 +114,7 @@ void testUpdateEnum() {
105114

106115
@Test
107116
void testUpdateVanillaBoolean() {
108-
DedicatedServer server = mockServer();
109-
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
117+
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
110118

111119
GameRulesService.GameRuleUpdate<Boolean> result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRules.FIRE_DAMAGE, false), CONNECTION_ID);
112120

@@ -121,8 +129,7 @@ void testUpdateVanillaBoolean() {
121129

122130
@Test
123131
void testUpdateVanillaInt() {
124-
DedicatedServer server = mockServer();
125-
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
132+
MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
126133

127134
GameRulesService.GameRuleUpdate<Integer> result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRules.RANDOM_TICK_SPEED, 123), CONNECTION_ID);
128135

@@ -149,8 +156,8 @@ private static <T> void assertEquals(@Language("JSON") String expected, GameRule
149156
}
150157

151158
private static final class GameRuleManagementHandlerTestImpl extends MinecraftGameRuleServiceImpl {
152-
private GameRuleManagementHandlerTestImpl(DedicatedServer server, JsonRpcLogger logger) {
153-
super(server, logger);
159+
private GameRuleManagementHandlerTestImpl(NotificationManager notificationManager, JsonRpcLogger jsonrpcLogger) {
160+
super(notificationManager, jsonrpcLogger);
154161
}
155162

156163
public Stream<GameRule<?>> getAvailableGameRules() {

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/PictureInPictureRendererRegistry.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import net.minecraft.client.Minecraft;
2424
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
25-
import net.minecraft.client.renderer.SubmitNodeCollector;
2625
import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
2726

2827
import net.fabricmc.fabric.impl.client.rendering.PictureInPictureRendererRegistryImpl;

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererPool.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import net.minecraft.client.Minecraft;
2323
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
24-
import net.minecraft.client.renderer.SubmitNodeCollector;
2524
import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
2625

2726
public final class PictureInPictureRendererPool<T extends PictureInPictureRenderState> implements AutoCloseable {

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererRegistryImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import net.minecraft.client.gui.render.pip.GuiSignRenderer;
3434
import net.minecraft.client.gui.render.pip.GuiSkinRenderer;
3535
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
36-
import net.minecraft.client.renderer.SubmitNodeCollector;
3736
import net.minecraft.client.renderer.state.gui.pip.GuiBannerResultRenderState;
3837
import net.minecraft.client.renderer.state.gui.pip.GuiBookModelRenderState;
3938
import net.minecraft.client.renderer.state.gui.pip.GuiEntityRenderState;

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GameRendererMixin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import net.minecraft.client.gui.render.GuiRenderer;
2929
import net.minecraft.client.renderer.GameRenderer;
3030
import net.minecraft.client.renderer.ItemInHandRenderer;
31-
import net.minecraft.client.renderer.SubmitNodeStorage;
3231
import net.minecraft.client.resources.model.ModelManager;
3332

3433
import net.fabricmc.fabric.impl.client.rendering.GuiRendererExtensions;

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.IdentityHashMap;
2121
import java.util.List;
2222
import java.util.Map;
23-
import java.util.Objects;
2423

2524
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
2625
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -45,8 +44,6 @@
4544
import net.minecraft.client.Minecraft;
4645
import net.minecraft.client.gui.render.GuiRenderer;
4746
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
48-
import net.minecraft.client.renderer.SubmitNodeCollector;
49-
import net.minecraft.client.renderer.SubmitNodeStorage;
5047
import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
5148
import net.minecraft.client.renderer.state.gui.GuiRenderState;
5249
import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;

‎fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/LevelRenderEventsTests.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ private static boolean beforeBlockOutline(LevelRenderContext context, BlockOutli
6767
poseStack.scale(0.5f, 0.5f, 0.5f);
6868
AABB box = new AABB(0, 0, 0, 1, 1, 1);
6969
int green = ARGB.colorFromFloat(1.0f, 0, 1, 0);
70-
// TestRenderUtils.drawFilledBox(poseStack, context.bufferSource().getBuffer(RenderTypes.debugFilledBox()), box, green);
70+
context.submitNodeCollector().submitCustomGeometry(poseStack, RenderTypes.debugFilledBox(), (pose, buffer) -> {
71+
TestRenderUtils.drawFilledBox(pose, buffer, box, green);
72+
});
7173
poseStack.popPose();
7274
}
7375

@@ -85,7 +87,9 @@ private static void renderBeforeTranslucent(LevelRenderContext context) {
8587

8688
AABB box = new AABB(BlockPos.ZERO.above(100));
8789
int color = ARGB.colorFromFloat(0.5f, 0, 1, 0);
88-
// TestRenderUtils.drawFilledBox(context.poseStack(), context.bufferSource().getBuffer(RenderTypes.debugFilledBox()), box, color);
90+
context.submitNodeCollector().submitCustomGeometry(context.poseStack(), RenderTypes.debugFilledBox(), (pose, buffer) -> {
91+
TestRenderUtils.drawFilledBox(pose, buffer, box, color);
92+
});
8993

9094
context.poseStack().popPose();
9195
}

‎fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TestRenderUtils.java‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,40 @@
1818

1919
import com.mojang.blaze3d.vertex.PoseStack;
2020
import com.mojang.blaze3d.vertex.VertexConsumer;
21-
import org.joml.Matrix4f;
2221

2322
import net.minecraft.world.phys.AABB;
2423

2524
public class TestRenderUtils {
26-
public static void drawFilledBox(PoseStack poseStack, VertexConsumer vertexConsumer, AABB box, int color) {
27-
Matrix4f matrix4f = poseStack.last().pose();
28-
25+
public static void drawFilledBox(PoseStack.Pose pose, VertexConsumer vertexConsumer, AABB box, int color) {
2926
// Front
30-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
31-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
32-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
33-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
27+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
28+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
29+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
30+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
3431
// Back
35-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
36-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
37-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
38-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
32+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
33+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
34+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
35+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
3936
// Left
40-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
41-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
42-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
43-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
37+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
38+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
39+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
40+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
4441
// Right
45-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
46-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
47-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
48-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
42+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
43+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
44+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
45+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
4946
// Top
50-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
51-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
52-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
53-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
47+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
48+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
49+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
50+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
5451
// Bottom
55-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
56-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
57-
vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
58-
vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
52+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
53+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
54+
vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
55+
vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
5956
}
6057
}

‎fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/MinecraftServerMixin.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import java.util.Optional;
2222

2323
import com.mojang.datafixers.DataFixer;
24-
25-
import net.minecraft.server.notifications.NotificationManager;
26-
2724
import org.spongepowered.asm.mixin.Mixin;
2825
import org.spongepowered.asm.mixin.Shadow;
2926
import org.spongepowered.asm.mixin.Unique;
@@ -36,11 +33,11 @@
3633
import net.minecraft.server.Services;
3734
import net.minecraft.server.WorldStem;
3835
import net.minecraft.server.level.progress.LevelLoadListener;
36+
import net.minecraft.server.notifications.NotificationManager;
3937
import net.minecraft.server.packs.PackResources;
4038
import net.minecraft.server.packs.repository.KnownPack;
4139
import net.minecraft.server.packs.repository.Pack;
4240
import net.minecraft.server.packs.repository.PackRepository;
43-
import net.minecraft.world.level.gamerules.GameRules;
4441
import net.minecraft.world.level.storage.LevelStorageSource;
4542

4643
import net.fabricmc.fabric.api.resource.v1.DataResourceStore;

0 commit comments

Comments
 (0)