Skip to content

Commit 92da646

Browse files
ApexModderApexModder
committed
Fix more compile errors
Game launches but command does not work
1 parent c99f013 commit 92da646

File tree

15 files changed

+205
-234
lines changed

15 files changed

+205
-234
lines changed

‎levels/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ dependencies {
2525
annotationProcessor("org.spongepowered:mixin:${forge.versions.mixin.get()}:processor")
2626
}
2727

28+
tasks.withType<JavaCompile> {
29+
options.encoding = "UTF-8"
30+
options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
31+
}
32+
2833
tasks.jar {
2934
manifest.attributes(
3035
"FMLModType" to "GAMELIBRARY",

‎rendering/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ dependencies {
2626
annotationProcessor("org.spongepowered:mixin:${forge.versions.mixin.get()}:processor")
2727
}
2828

29+
tasks.withType<JavaCompile> {
30+
options.encoding = "UTF-8"
31+
options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
32+
}
33+
2934
tasks.jar {
3035
manifest.attributes(
3136
"FMLModType" to "GAMELIBRARY",

‎rendering/src/main/java/dev/compactmods/gander/render/FluidVertexConsumer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public VertexConsumer uv2(int u, int v) {
4545

4646
@Override
4747
public VertexConsumer normal(float x, float y, float z) {
48-
return prior.normal(pose.last(), x, y, z);
48+
return prior.normal(pose.last().normal(), x, y, z);
4949
}
5050

5151
@Override

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

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

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

86
import org.joml.Vector3f;
97

10-
import com.mojang.blaze3d.vertex.BufferBuilder;
11-
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
12-
import com.mojang.blaze3d.vertex.PoseStack;
13-
import com.mojang.blaze3d.vertex.VertexBuffer;
14-
import com.mojang.blaze3d.vertex.VertexFormat;
15-
import com.mojang.blaze3d.vertex.VertexSorting;
16-
17-
import dev.compactmods.gander.render.FluidVertexConsumer;
18-
import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
19-
import net.minecraft.client.Minecraft;
208
import net.minecraft.client.renderer.ChunkBufferBuilderPack;
21-
import net.minecraft.client.renderer.ItemBlockRenderTypes;
229
import net.minecraft.client.renderer.RenderType;
23-
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
24-
import net.minecraft.client.renderer.block.ModelBlockRenderer;
25-
import net.minecraft.client.renderer.chunk.RenderChunkRegion;
26-
import net.minecraft.client.renderer.chunk.RenderRegionCache;
27-
import net.minecraft.client.renderer.texture.OverlayTexture;
28-
import net.minecraft.client.resources.model.BakedModel;
29-
import net.minecraft.core.BlockPos;
30-
import net.minecraft.util.RandomSource;
3110
import net.minecraft.world.level.Level;
32-
import net.minecraft.world.level.block.RenderShape;
33-
import net.minecraft.world.level.block.entity.BlockEntity;
34-
import net.minecraft.world.level.block.state.BlockState;
3511
import net.minecraft.world.level.levelgen.structure.BoundingBox;
36-
import net.minecraft.world.level.material.FluidState;
37-
import net.minecraftforge.client.model.data.ModelData;
3812

3913
public class LevelBakery {
4014

4115
public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries, Vector3f cameraPosition) {
4216

43-
final Set<RenderType> visitedBlockRenderTypes = new HashSet<>();
17+
/*final Set<RenderType> visitedBlockRenderTypes = new HashSet<>();
4418
final Set<RenderType> visitedFluidRenderTypes = new HashSet<>();
4519
final RenderRegionCache regionCache = new RenderRegionCache();
4620
final ChunkBufferBuilderPack blockPack = new ChunkBufferBuilderPack();
@@ -159,14 +133,18 @@ public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries,
159133
}
160134
});
161135
162-
return new BakedLevel(new WeakReference<>(level), blockPack, fluidPack, blockGeometry, fluidGeometry, blockTransparencyState, fluidTransparencyState, blockBoundaries);
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());
163141
}
164142

165-
private static RenderChunkRegion createRegion(RenderRegionCache cache, List<AddSectionGeometryEvent.AdditionalSectionRenderer> additionalRenderers, Level level, BoundingBox bounds) {
143+
/*private static RenderChunkRegion createRegion(RenderRegionCache cache, List<AddSectionGeometryEvent.AdditionalSectionRenderer> additionalRenderers, Level level, BoundingBox bounds) {
166144
return cache.createRegion(level,
167145
new BlockPos(bounds.minX(), bounds.minY(), bounds.minZ()),
168146
new BlockPos(bounds.maxX(), bounds.maxY(), bounds.maxZ()),
169147
0,
170148
additionalRenderers.isEmpty());
171-
}
149+
}*/
172150
}

‎rendering/src/main/resources/META-INF/accesstransformer.cfg‎

Lines changed: 26 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,27 @@
1-
# Translucency (screm)
2-
public net.minecraft.client.renderer.LevelRenderer transparencyChain
3-
4-
public net.minecraft.client.renderer.RenderType$CompositeRenderType
5-
public net.minecraft.client.renderer.RenderType sortOnUpload
6-
7-
# ARE YOU HAPPY NOW, FRY
8-
public net.minecraft.client.renderer.RenderType$CompositeState <init>(Lnet/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TransparencyStateShard;Lnet/minecraft/client/renderer/RenderStateShard$DepthTestStateShard;Lnet/minecraft/client/renderer/RenderStateShard$CullStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LightmapStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OverlayStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OutputStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TexturingStateShard;Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LineStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ColorLogicStateShard;Lnet/minecraft/client/renderer/RenderType$OutlineProperty;)V # <init>
9-
public net.minecraft.client.renderer.RenderType$CompositeState textureState
10-
public net.minecraft.client.renderer.RenderType$CompositeState shaderState
11-
public net.minecraft.client.renderer.RenderType$CompositeState transparencyState
12-
public net.minecraft.client.renderer.RenderType$CompositeState depthTestState
13-
public net.minecraft.client.renderer.RenderType$CompositeState cullState
14-
public net.minecraft.client.renderer.RenderType$CompositeState lightmapState
15-
public net.minecraft.client.renderer.RenderType$CompositeState overlayState
16-
public net.minecraft.client.renderer.RenderType$CompositeState layeringState
17-
public net.minecraft.client.renderer.RenderType$CompositeState texturingState
18-
public net.minecraft.client.renderer.RenderType$CompositeState writeMaskState
19-
public net.minecraft.client.renderer.RenderType$CompositeState lineState
20-
public net.minecraft.client.renderer.RenderType$CompositeState colorLogicState
21-
public net.minecraft.client.renderer.RenderType$CompositeState outlineProperty
22-
public net.minecraft.client.renderer.RenderType$CompositeState outputState
23-
24-
public net.minecraft.client.renderer.RenderStateShard MAIN_TARGET
25-
public net.minecraft.client.renderer.RenderStateShard OUTLINE_TARGET
26-
public net.minecraft.client.renderer.RenderStateShard TRANSLUCENT_TARGET
27-
public net.minecraft.client.renderer.RenderStateShard PARTICLES_TARGET
28-
public net.minecraft.client.renderer.RenderStateShard WEATHER_TARGET
29-
public net.minecraft.client.renderer.RenderStateShard CLOUDS_TARGET
30-
public net.minecraft.client.renderer.RenderStateShard ITEM_ENTITY_TARGET
31-
32-
# But why tho
33-
public net.minecraft.client.renderer.PostChain getRenderTarget(Ljava/lang/String;)Lcom/mojang/blaze3d/pipeline/RenderTarget;
34-
35-
# I blame Proguard for this
36-
public net.minecraft.client.renderer.MultiBufferSource$BufferSource builder
37-
public net.minecraft.client.renderer.MultiBufferSource$BufferSource fixedBuffers
38-
public net.minecraft.client.renderer.MultiBufferSource$BufferSource lastState
39-
public net.minecraft.client.renderer.MultiBufferSource$BufferSource startedBuffers
40-
41-
# effective. Power لُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗
42-
1+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource f_109904_ # builder
2+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource f_109905_ # fixedBuffers
433
public com.mojang.blaze3d.platform.GlStateManager$TextureState
44-
45-
protected net.minecraft.client.renderer.EffectInstance dirty
46-
protected net.minecraft.client.renderer.EffectInstance lastAppliedEffect
47-
protected net.minecraft.client.renderer.EffectInstance blend
48-
protected net.minecraft.client.renderer.EffectInstance programId
49-
protected net.minecraft.client.renderer.EffectInstance lastProgramId
50-
protected net.minecraft.client.renderer.EffectInstance samplerLocations
51-
protected net.minecraft.client.renderer.EffectInstance samplerNames
52-
protected net.minecraft.client.renderer.EffectInstance samplerMap
53-
protected net.minecraft.client.renderer.EffectInstance uniforms
4+
public net.minecraft.client.renderer.RenderStateShard f_110123_ # MAIN_TARGET
5+
public net.minecraft.client.renderer.RenderStateShard f_110124_ # OUTLINE_TARGET
6+
public net.minecraft.client.renderer.RenderStateShard f_110125_ # TRANSLUCENT_TARGET
7+
public net.minecraft.client.renderer.RenderStateShard f_110126_ # PARTICLES_TARGET
8+
public net.minecraft.client.renderer.RenderStateShard f_110127_ # WEATHER_TARGET
9+
public net.minecraft.client.renderer.RenderStateShard f_110128_ # CLOUDS_TARGET
10+
public net.minecraft.client.renderer.RenderStateShard f_110129_ # ITEM_ENTITY_TARGET
11+
public net.minecraft.client.renderer.RenderType$CompositeState f_110587_ # outputState
12+
public net.minecraft.client.renderer.RenderType$CompositeRenderType
13+
public net.minecraft.client.renderer.RenderType$CompositeState f_110576_ # textureState
14+
public net.minecraft.client.renderer.RenderType$CompositeState f_173274_ # shaderState
15+
public net.minecraft.client.renderer.RenderType$CompositeState f_110577_ # transparencyState
16+
public net.minecraft.client.renderer.RenderType$CompositeState f_110581_ # depthTestState
17+
public net.minecraft.client.renderer.RenderType$CompositeState f_110582_ # cullState
18+
public net.minecraft.client.renderer.RenderType$CompositeState f_110583_ # lightmapState
19+
public net.minecraft.client.renderer.RenderType$CompositeState f_110584_ # overlayState
20+
public net.minecraft.client.renderer.RenderType$CompositeState f_110586_ # layeringState
21+
public net.minecraft.client.renderer.RenderType$CompositeState f_110588_ # texturingState
22+
public net.minecraft.client.renderer.RenderType$CompositeState f_110589_ # writeMaskState
23+
public net.minecraft.client.renderer.RenderType$CompositeState f_110590_ # lineState
24+
public net.minecraft.client.renderer.RenderType$CompositeState f_285566_ # colorLogicState
25+
public net.minecraft.client.renderer.RenderType$CompositeState f_110591_ # outlineProperty
26+
public net.minecraft.client.renderer.RenderType f_110393_ # sortOnUpload
27+
public net.minecraft.client.renderer.RenderType$CompositeState <init>(Lnet/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TransparencyStateShard;Lnet/minecraft/client/renderer/RenderStateShard$DepthTestStateShard;Lnet/minecraft/client/renderer/RenderStateShard$CullStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LightmapStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OverlayStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OutputStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TexturingStateShard;Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LineStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ColorLogicStateShard;Lnet/minecraft/client/renderer/RenderType$OutlineProperty;)V # CompositeState

‎rendering/src/main/resources/META-INF/accesstransformer.cfg.old‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Translucency (screm)
2+
public net.minecraft.client.renderer.LevelRenderer transparencyChain
3+
4+
public net.minecraft.client.renderer.RenderType$CompositeRenderType
5+
public net.minecraft.client.renderer.RenderType sortOnUpload
6+
7+
# ARE YOU HAPPY NOW, FRY
8+
public net.minecraft.client.renderer.RenderType$CompositeState <init>(Lnet/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TransparencyStateShard;Lnet/minecraft/client/renderer/RenderStateShard$DepthTestStateShard;Lnet/minecraft/client/renderer/RenderStateShard$CullStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LightmapStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OverlayStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OutputStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TexturingStateShard;Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LineStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ColorLogicStateShard;Lnet/minecraft/client/renderer/RenderType$OutlineProperty;)V # <init>
9+
public net.minecraft.client.renderer.RenderType$CompositeState textureState
10+
public net.minecraft.client.renderer.RenderType$CompositeState shaderState
11+
public net.minecraft.client.renderer.RenderType$CompositeState transparencyState
12+
public net.minecraft.client.renderer.RenderType$CompositeState depthTestState
13+
public net.minecraft.client.renderer.RenderType$CompositeState cullState
14+
public net.minecraft.client.renderer.RenderType$CompositeState lightmapState
15+
public net.minecraft.client.renderer.RenderType$CompositeState overlayState
16+
public net.minecraft.client.renderer.RenderType$CompositeState layeringState
17+
public net.minecraft.client.renderer.RenderType$CompositeState texturingState
18+
public net.minecraft.client.renderer.RenderType$CompositeState writeMaskState
19+
public net.minecraft.client.renderer.RenderType$CompositeState lineState
20+
public net.minecraft.client.renderer.RenderType$CompositeState colorLogicState
21+
public net.minecraft.client.renderer.RenderType$CompositeState outlineProperty
22+
public net.minecraft.client.renderer.RenderType$CompositeState outputState
23+
24+
public net.minecraft.client.renderer.RenderStateShard MAIN_TARGET
25+
public net.minecraft.client.renderer.RenderStateShard OUTLINE_TARGET
26+
public net.minecraft.client.renderer.RenderStateShard TRANSLUCENT_TARGET
27+
public net.minecraft.client.renderer.RenderStateShard PARTICLES_TARGET
28+
public net.minecraft.client.renderer.RenderStateShard WEATHER_TARGET
29+
public net.minecraft.client.renderer.RenderStateShard CLOUDS_TARGET
30+
public net.minecraft.client.renderer.RenderStateShard ITEM_ENTITY_TARGET
31+
32+
# But why tho
33+
public net.minecraft.client.renderer.PostChain getRenderTarget(Ljava/lang/String;)Lcom/mojang/blaze3d/pipeline/RenderTarget;
34+
35+
# I blame Proguard for this
36+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource builder
37+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource fixedBuffers
38+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource lastState
39+
public net.minecraft.client.renderer.MultiBufferSource$BufferSource startedBuffers
40+
41+
# effective. Power لُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗
42+
43+
public com.mojang.blaze3d.platform.GlStateManager$TextureState
44+
45+
protected net.minecraft.client.renderer.EffectInstance dirty
46+
protected net.minecraft.client.renderer.EffectInstance lastAppliedEffect
47+
protected net.minecraft.client.renderer.EffectInstance blend
48+
protected net.minecraft.client.renderer.EffectInstance programId
49+
protected net.minecraft.client.renderer.EffectInstance lastProgramId
50+
protected net.minecraft.client.renderer.EffectInstance samplerLocations
51+
protected net.minecraft.client.renderer.EffectInstance samplerNames
52+
protected net.minecraft.client.renderer.EffectInstance samplerMap
53+
protected net.minecraft.client.renderer.EffectInstance uniforms

‎testmod/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,8 @@ dependencies {
7171
implementation(project(":levels"))
7272
implementation(project(":rendering"))
7373
}
74+
75+
tasks.withType<JavaCompile> {
76+
options.encoding = "UTF-8"
77+
options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
78+
}

‎testmod/src/main/java/dev/compactmods/gander/GanderLib.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,29 @@
66

77
import com.mojang.logging.LogUtils;
88

9+
import dev.compactmods.gander.network.OpenGanderUiForDeferredStructureRequest;
10+
import dev.compactmods.gander.network.OpenGanderUiForStructureRequest;
11+
import dev.compactmods.gander.network.StructureSceneDataRequest;
912
import net.minecraft.resources.ResourceLocation;
1013
import net.minecraft.world.entity.Entity;
1114
import net.minecraft.world.level.Level;
1215
import net.minecraftforge.fml.common.Mod;
13-
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
16+
import net.minecraftforge.network.NetworkRegistry;
17+
import net.minecraftforge.network.simple.SimpleChannel;
1418

1519
@Mod("gander")
1620
public class GanderLib {
1721

1822
public static final String ID = "gander";
1923

2024
public static final Logger LOGGER = LogUtils.getLogger();
25+
public static final String NET_VERSION = "1";
26+
public static final SimpleChannel CHANNEL = NetworkRegistry.newSimpleChannel(
27+
asResource("main"),
28+
() -> NET_VERSION,
29+
NET_VERSION::equals,
30+
NET_VERSION::equals
31+
);
2132

2233
/**
2334
* Use the {@link Random} of a local {@link Level} or {@link Entity} or create one
@@ -26,25 +37,16 @@ public class GanderLib {
2637
public static final Random RANDOM = new Random();
2738

2839
public GanderLib(/*IEventBus modEventBus*/) {
29-
var modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
30-
// modEventBus.addListener(GanderLib::onPacketRegistration);
40+
onPacketRegistration();
3141
}
3242

3343
public static ResourceLocation asResource(String path) {
3444
return new ResourceLocation(ID, path);
3545
}
3646

37-
// TODO: down port this
38-
/*private static void onPacketRegistration(final RegisterPayloadHandlersEvent payloads) {
39-
final var main = payloads.registrar("1");
40-
41-
main.playToClient(OpenGanderUiForDeferredStructureRequest.ID, OpenGanderUiForDeferredStructureRequest.STREAM_CODEC, OpenGanderUiForDeferredStructureRequest.HANDLER)
42-
.executesOn(HandlerThread.MAIN);
43-
44-
main.playToServer(StructureSceneDataRequest.ID, StructureSceneDataRequest.STREAM_CODEC, StructureSceneDataRequest.HANDLER)
45-
.executesOn(HandlerThread.MAIN);
46-
47-
main.playToClient(OpenGanderUiForStructureRequest.ID, OpenGanderUiForStructureRequest.STREAM_CODEC, OpenGanderUiForStructureRequest.HANDLER)
48-
.executesOn(HandlerThread.MAIN);
49-
}*/
47+
private void onPacketRegistration() {
48+
CHANNEL.registerMessage(0, OpenGanderUiForDeferredStructureRequest.class, OpenGanderUiForDeferredStructureRequest::encode, OpenGanderUiForDeferredStructureRequest::new, OpenGanderUiForDeferredStructureRequest::handle);
49+
CHANNEL.registerMessage(1, OpenGanderUiForStructureRequest.class, OpenGanderUiForStructureRequest::encode, OpenGanderUiForStructureRequest::new, OpenGanderUiForStructureRequest::handle);
50+
CHANNEL.registerMessage(2, StructureSceneDataRequest.class, StructureSceneDataRequest::encode, StructureSceneDataRequest::new, StructureSceneDataRequest::handle);
51+
}
5052
}

0 commit comments

Comments
 (0)