Skip to content

Commit cd64d08

Browse files
ApexModderApexModder
committed
Comment out everything - it now *kinda* works
1 parent 92da646 commit cd64d08

File tree

8 files changed

+69
-43
lines changed

8 files changed

+69
-43
lines changed

‎levels/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ tasks.withType<JavaCompile> {
3333
tasks.jar {
3434
manifest.attributes(
3535
"FMLModType" to "GAMELIBRARY",
36-
"Automatic-Module-Name" to "ganderlevels"
36+
"Automatic-Module-Name" to "ganderlevels",
37+
"MixinConfigs" to "gander_levels.mixins.json"
3738
)
3839
}

‎levels/src/main/resources/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FMLModType: GAMELIBRARY
22
Automatic-Module-Name: ganderlevels
3+
MixinConfigs: gander_levels.mixins.json

‎rendering/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ tasks.withType<JavaCompile> {
3434
tasks.jar {
3535
manifest.attributes(
3636
"FMLModType" to "GAMELIBRARY",
37-
"Automatic-Module-Name" to "ganderrendering"
37+
"Automatic-Module-Name" to "ganderrendering",
38+
"MixinConfigs" to "gander_render.mixins.json"
3839
)
3940
}

‎rendering/src/main/java/dev/compactmods/gander/render/baked/LevelBakery.java‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
package dev.compactmods.gander.render.baked;
22

33
import java.lang.ref.WeakReference;
4-
import java.util.Map;
4+
import java.util.HashSet;
5+
import java.util.Set;
56

67
import org.joml.Vector3f;
78

9+
import com.mojang.blaze3d.vertex.BufferBuilder;
10+
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
11+
import com.mojang.blaze3d.vertex.PoseStack;
12+
import com.mojang.blaze3d.vertex.VertexBuffer;
13+
import com.mojang.blaze3d.vertex.VertexFormat;
14+
import com.mojang.blaze3d.vertex.VertexSorting;
15+
16+
import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
17+
import net.minecraft.client.Minecraft;
818
import net.minecraft.client.renderer.ChunkBufferBuilderPack;
919
import net.minecraft.client.renderer.RenderType;
20+
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
21+
import net.minecraft.client.renderer.block.ModelBlockRenderer;
22+
import net.minecraft.client.renderer.chunk.RenderRegionCache;
23+
import net.minecraft.client.renderer.texture.OverlayTexture;
24+
import net.minecraft.client.resources.model.BakedModel;
25+
import net.minecraft.core.BlockPos;
26+
import net.minecraft.util.RandomSource;
1027
import net.minecraft.world.level.Level;
28+
import net.minecraft.world.level.block.RenderShape;
29+
import net.minecraft.world.level.block.entity.BlockEntity;
30+
import net.minecraft.world.level.block.state.BlockState;
1131
import net.minecraft.world.level.levelgen.structure.BoundingBox;
32+
import net.minecraft.world.level.material.FluidState;
33+
import net.minecraftforge.client.model.data.ModelData;
1234

1335
public class LevelBakery {
1436

1537
public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries, Vector3f cameraPosition) {
1638

17-
/*final Set<RenderType> visitedBlockRenderTypes = new HashSet<>();
39+
final Set<RenderType> visitedBlockRenderTypes = new HashSet<>();
1840
final Set<RenderType> visitedFluidRenderTypes = new HashSet<>();
1941
final RenderRegionCache regionCache = new RenderRegionCache();
2042
final ChunkBufferBuilderPack blockPack = new ChunkBufferBuilderPack();
@@ -66,30 +88,30 @@ public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries,
6688
});
6789
}
6890

69-
if (!fluidState.isEmpty()) {
91+
/*if (!fluidState.isEmpty()) {
7092
final var fluidRenderType = ItemBlockRenderTypes.getRenderLayer(fluidState);
7193
var typedVC = fluidPack.builder(fluidRenderType);
7294
if (visitedFluidRenderTypes.add(fluidRenderType)) {
7395
typedVC.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.BLOCK);
7496
}
7597
76-
dispatcher.getLiquidBlockRenderer().tesselate(level, pos, new FluidVertexConsumer(typedVC, pose, pos), state, fluidState);
77-
}
98+
// dispatcher.getLiquidBlockRenderer().tesselate(level, pos, new FluidVertexConsumer(typedVC, pose, pos), state, fluidState);
99+
}*/
78100

79101
pose.popPose();
80102
ModelBlockRenderer.clearCache();
81103
});
82104

83-
final var additionalRenderers = ClientHooks.gatherAdditionalRenderers(BlockPos.ZERO, level);
105+
// final var additionalRenderers = ClientHooks.gatherAdditionalRenderers(BlockPos.ZERO, level);
84106

85107
// TODO - Hook for multiplatform?
86-
net.neoforged.neoforge.client.ClientHooks.addAdditionalGeometry(additionalRenderers, (type) -> {
108+
/*net.neoforged.neoforge.client.ClientHooks.addAdditionalGeometry(additionalRenderers, (type) -> {
87109
BufferBuilder builder = blockPack.builder(type);
88110
if (visitedBlockRenderTypes.add(type)) {
89111
builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.BLOCK);
90112
}
91113
return builder;
92-
}, createRegion(regionCache, additionalRenderers, level, blockBoundaries), pose);
114+
}, createRegion(regionCache, additionalRenderers, level, blockBoundaries), pose);*/
93115

94116
BufferBuilder.SortState blockTransparencyState = null;
95117
if (visitedBlockRenderTypes.contains(RenderType.translucent())) {
@@ -133,11 +155,7 @@ public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries,
133155
}
134156
});
135157

136-
return new BakedLevel(new WeakReference<>(level), blockPack, fluidPack, blockGeometry, fluidGeometry, blockTransparencyState, fluidTransparencyState, blockBoundaries);*/
137-
138-
var blockBuilders = new ChunkBufferBuilderPack();
139-
var fluidBuilders = new ChunkBufferBuilderPack();
140-
return new BakedLevel(new WeakReference<>(level), blockBuilders, fluidBuilders, Map.of(), Map.of(), blockBuilders.builder(RenderType.cutout()).getSortState(), fluidBuilders.builder(RenderType.translucent()).getSortState(), BoundingBox.infinite());
158+
return new BakedLevel(new WeakReference<>(level), blockPack, fluidPack, blockGeometry, fluidGeometry, blockTransparencyState, fluidTransparencyState, blockBoundaries);
141159
}
142160

143161
/*private static RenderChunkRegion createRegion(RenderRegionCache cache, List<AddSectionGeometryEvent.AdditionalSectionRenderer> additionalRenderers, Level level, BoundingBox bounds) {

‎rendering/src/main/java/dev/compactmods/gander/render/mixin/CompositeRenderTypeMixin.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
package dev.compactmods.gander.render.mixin;
22

3-
import com.mojang.blaze3d.pipeline.RenderTarget;
3+
import java.util.Optional;
4+
5+
import org.spongepowered.asm.mixin.Debug;
6+
import org.spongepowered.asm.mixin.Final;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.Mutable;
9+
import org.spongepowered.asm.mixin.Shadow;
10+
import org.spongepowered.asm.mixin.gen.Accessor;
411

512
import com.mojang.blaze3d.vertex.VertexFormat;
613

@@ -10,14 +17,7 @@
1017
import net.minecraft.client.renderer.RenderStateShard;
1118
import net.minecraft.client.renderer.RenderType;
1219

13-
import org.spongepowered.asm.mixin.Final;
14-
import org.spongepowered.asm.mixin.Mixin;
15-
import org.spongepowered.asm.mixin.Mutable;
16-
import org.spongepowered.asm.mixin.Shadow;
17-
import org.spongepowered.asm.mixin.gen.Accessor;
18-
19-
import java.util.Optional;
20-
20+
@Debug(export = true)
2121
@Mixin(RenderType.CompositeRenderType.class)
2222
public abstract class CompositeRenderTypeMixin extends RenderType implements GanderCompositeRenderType {
2323

‎rendering/src/main/resources/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FMLModType: GAMELIBRARY
22
Automatic-Module-Name: ganderrendering
3+
MixinConfigs: gander_render.mixins.json

‎testmod/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ minecraft {
2727
workingDirectory(file("run/client"))
2828
}
2929

30+
create("server") {
31+
workingDirectory(file("run/server"))
32+
}
33+
3034
configureEach {
3135
// Recommended logging data for a userdev environment
3236
// The markers can be added/remove as needed separated by commas.

‎testmod/src/main/java/dev/compactmods/gander/client/gui/widget/SpatialRenderer.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,38 +152,38 @@ public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float par
152152
.stream()
153153
.map(blockAndTints::getBlockEntity)
154154
.filter(Objects::nonNull);
155-
PoseStack poseStack = graphics.pose();
156-
poseStack.pushPose();
155+
// PoseStack poseStack = graphics.pose();
156+
// poseStack.pushPose();
157157
{
158158
var poseStack2 = RenderSystem.getModelViewStack();
159-
poseStack2.pushPose();
160-
poseStack2.setIdentity();
161-
RenderSystem.applyModelViewMatrix();
159+
// poseStack2.pushPose();
160+
// poseStack2.setIdentity();
161+
// RenderSystem.applyModelViewMatrix();
162162

163-
poseStack.setIdentity();
164-
poseStack.mulPose(camera.rotation());
163+
// poseStack.setIdentity();
164+
// poseStack.mulPose(camera.rotation());
165165

166-
translucencyChain.clear();
167-
translucencyChain.prepareBackgroundColor(Minecraft.getInstance().getMainRenderTarget());
168-
renderTarget.bindWrite(true);
166+
// translucencyChain.clear();
167+
// translucencyChain.prepareBackgroundColor(Minecraft.getInstance().getMainRenderTarget());
168+
// renderTarget.bindWrite(true);
169169

170-
RenderSystem.setProjectionMatrix(projectionMatrix, VertexSorting.byDistance(camera.getLookFrom()));
171-
renderScene(blockEntities, buffer, partialTicks, poseStack);
170+
// RenderSystem.setProjectionMatrix(projectionMatrix, VertexSorting.byDistance(camera.getLookFrom()));
171+
renderScene(blockEntities, buffer, partialTicks, graphics.pose());
172172

173173
final var mainTarget = Minecraft.getInstance().getMainRenderTarget();
174174

175-
mainTarget.bindWrite(true);
176-
UGH(renderTarget);
175+
// mainTarget.bindWrite(true);
176+
// UGH(renderTarget);
177177

178-
RenderSystem.setProjectionMatrix(projectionMatrix, VertexSorting.byDistance(camera.getLookFrom()));
178+
// RenderSystem.setProjectionMatrix(projectionMatrix, VertexSorting.byDistance(camera.getLookFrom()));
179179
//renderCompass(graphics, partialTicks, poseStack);
180180

181-
poseStack2.popPose();
182-
RenderSystem.applyModelViewMatrix();
181+
// poseStack2.popPose();
182+
// RenderSystem.applyModelViewMatrix();
183183
}
184-
poseStack.popPose();
184+
// poseStack.popPose();
185185

186-
RenderSystem.setProjectionMatrix(originalMatrix, originalSorting);
186+
// RenderSystem.setProjectionMatrix(originalMatrix, originalSorting);
187187

188188
// TODO Fix Particles
189189
// scene.getLevel().renderParticles(pose, buffer, camera, partialTicks);

0 commit comments

Comments
 (0)