Skip to content

Commit 3aade62

Browse files
robotgryphonrobotgryphon
committed
Initial 1.19 port
1 parent 1e5447d commit 3aade62

File tree

63 files changed

+377
-676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+377
-676
lines changed

‎build.gradle‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,17 +273,18 @@ dependencies {
273273
library "io.reactivex.rxjava3:rxjava:3.1.1";
274274

275275
// Nicephore - Screenshots and Stuff
276-
runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3574658"))
277-
278-
// Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
279-
runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
276+
// runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3823401"))
280277

281278
// JEI
282-
compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}:api")
283-
runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}")
279+
compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")
280+
compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")
281+
runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")
284282

285283
// The One Probe
286-
implementation(fg.deobf("curse.maven:theoneprobe-245211:3550084"))
284+
implementation(fg.deobf("curse.maven:theoneprobe-245211:3871444"))
285+
286+
// Spark
287+
runtimeOnly(fg.deobf("curse.maven:spark-361579:3875647"))
287288
}
288289

289290
processResources {

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

6-
minecraft_version=1.18.2
7-
forge_version=40.0.18
6+
minecraft_version=1.19
7+
forge_version=41.0.99
88

99
mod_id=compactcrafting
1010

1111
# Dependencies and Libs
12-
jei_mc_version=1.18.2
13-
jei_version=9.5.2.135
12+
jei_mc_version=1.19
13+
jei_version=11.0.0.222
1414

1515
# Curseforge
1616
cf_project=429735
17-
cf_release_type=release
17+
cf_release_type=beta

‎src/api/java/dev/compactmods/crafting/api/catalyst/CatalystType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package dev.compactmods.crafting.api.catalyst;
22

33
import com.mojang.serialization.Codec;
4-
import net.minecraftforge.registries.IForgeRegistryEntry;
54

6-
public interface CatalystType<Matcher extends ICatalystMatcher> extends IForgeRegistryEntry<CatalystType<?>> {
5+
public interface CatalystType<Matcher extends ICatalystMatcher> {
76

87
Codec<Matcher> getCodec();
98
}

‎src/api/java/dev/compactmods/crafting/api/components/RecipeComponentType.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package dev.compactmods.crafting.api.components;
22

33
import com.mojang.serialization.Codec;
4-
import net.minecraftforge.registries.IForgeRegistryEntry;
54

6-
public interface RecipeComponentType<C extends IRecipeComponent>
7-
extends IForgeRegistryEntry<RecipeComponentType<?>> {
5+
public interface RecipeComponentType<C extends IRecipeComponent> {
86
Codec<C> getCodec();
97
}

‎src/api/java/dev/compactmods/crafting/api/recipe/layers/RecipeLayerType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package dev.compactmods.crafting.api.recipe.layers;
22

33
import com.mojang.serialization.Codec;
4-
import net.minecraftforge.registries.IForgeRegistryEntry;
54

6-
public interface RecipeLayerType<L extends IRecipeLayer> extends IForgeRegistryEntry<RecipeLayerType<?>> {
5+
public interface RecipeLayerType<L extends IRecipeLayer> {
76

87
Codec<L> getCodec();
98
}

‎src/main/java/dev/compactmods/crafting/client/ClientEventHandler.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.compactmods.crafting.client;
22

33
import javax.annotation.Nonnull;
4+
45
import com.mojang.blaze3d.vertex.PoseStack;
56
import dev.compactmods.crafting.CompactCrafting;
67
import dev.compactmods.crafting.api.EnumCraftingState;
@@ -22,6 +23,7 @@
2223
import net.minecraft.world.phys.Vec3;
2324
import net.minecraftforge.api.distmarker.Dist;
2425
import net.minecraftforge.client.event.RenderLevelLastEvent;
26+
import net.minecraftforge.client.event.RenderLevelStageEvent;
2527
import net.minecraftforge.event.TickEvent;
2628
import net.minecraftforge.eventbus.api.SubscribeEvent;
2729
import net.minecraftforge.fml.common.Mod;
@@ -34,7 +36,7 @@ public static void onTick(final TickEvent.ClientTickEvent evt) {
3436
if (evt.phase != TickEvent.Phase.START) return;
3537

3638
final LocalPlayer player = Minecraft.getInstance().player;
37-
if(player != null) {
39+
if (player != null) {
3840
player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
3941
.ifPresent(IProjectorRenderInfo::tick);
4042
}
@@ -47,18 +49,19 @@ public static void onTick(final TickEvent.ClientTickEvent evt) {
4749
}
4850

4951
@SubscribeEvent
50-
public static void onWorldRender(final RenderLevelLastEvent event) {
52+
public static void onWorldRender(final RenderLevelStageEvent event) {
5153
final Minecraft mc = Minecraft.getInstance();
52-
5354
if (mc.level == null)
5455
return;
5556

56-
doProjectorRender(event, mc);
57-
doFieldPreviewRender(event, mc);
57+
if (event.getStage().equals(RenderLevelStageEvent.Stage.AFTER_PARTICLES)) {
58+
doProjectorRender(event, mc);
59+
doFieldPreviewRender(event, mc);
60+
}
5861
}
5962

6063
@Nonnull
61-
private static void doFieldPreviewRender(RenderLevelLastEvent event, Minecraft mc) {
64+
private static void doFieldPreviewRender(RenderLevelStageEvent event, Minecraft mc) {
6265
final Camera mainCamera = mc.gameRenderer.getMainCamera();
6366
final HitResult hitResult = mc.hitResult;
6467

@@ -99,7 +102,7 @@ private static void doFieldPreviewRender(RenderLevelLastEvent event, Minecraft m
99102
buffers.endBatch();
100103
}
101104

102-
private static void doProjectorRender(RenderLevelLastEvent event, Minecraft mc) {
105+
private static void doProjectorRender(RenderLevelStageEvent event, Minecraft mc) {
103106
mc.player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
104107
.ifPresent(render -> render.render(event.getPoseStack()));
105108
}

‎src/main/java/dev/compactmods/crafting/client/fakeworld/RenderingWorld.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import dev.compactmods.crafting.recipes.MiniaturizationRecipe;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.core.*;
6+
import net.minecraft.data.BuiltinRegistries;
7+
import net.minecraft.data.worldgen.DimensionTypes;
68
import net.minecraft.sounds.SoundEvent;
79
import net.minecraft.sounds.SoundSource;
810
import net.minecraft.util.profiling.InactiveProfiler;
@@ -15,16 +17,20 @@
1517
import net.minecraft.world.level.block.Block;
1618
import net.minecraft.world.level.block.state.BlockState;
1719
import net.minecraft.world.level.chunk.ChunkSource;
20+
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
1821
import net.minecraft.world.level.dimension.DimensionType;
1922
import net.minecraft.world.level.entity.LevelEntityGetter;
2023
import net.minecraft.world.level.gameevent.GameEvent;
2124
import net.minecraft.world.level.material.Fluid;
2225
import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
26+
import net.minecraft.world.phys.Vec3;
2327
import net.minecraft.world.scores.Scoreboard;
2428
import net.minecraft.world.ticks.BlackholeTickAccess;
2529
import net.minecraft.world.ticks.LevelTickAccess;
30+
import net.minecraftforge.registries.ForgeRegistries;
2631

2732
import javax.annotation.Nullable;
33+
import java.awt.*;
2834
import java.util.Collections;
2935
import java.util.List;
3036

@@ -37,8 +43,8 @@ public class RenderingWorld extends Level {
3743
private final RenderingChunkProvider chunkProvider;
3844

3945
public RenderingWorld(MiniaturizationRecipe recipe) {
40-
super(new RenderingSpawnInfo(), Level.OVERWORLD, Holder.direct(DimensionType.DEFAULT_OVERWORLD),
41-
() -> InactiveProfiler.INSTANCE, true, false, 0);
46+
super(new RenderingSpawnInfo(), Level.OVERWORLD, BuiltinRegistries.DIMENSION_TYPE.getHolderOrThrow(BuiltinDimensionTypes.OVERWORLD),
47+
() -> InactiveProfiler.INSTANCE, true, false, 0, 1000000);
4248
this.recipe = recipe;
4349
this.chunkProvider = new RenderingChunkProvider(this, recipe);
4450
}
@@ -48,6 +54,16 @@ public void sendBlockUpdated(BlockPos p_184138_1_, BlockState p_184138_2_, Block
4854

4955
}
5056

57+
@Override
58+
public void playSeededSound(@org.jetbrains.annotations.Nullable Player p_220363_, double p_220364_, double p_220365_, double p_220366_, SoundEvent p_220367_, SoundSource p_220368_, float p_220369_, float p_220370_, long p_220371_) {
59+
60+
}
61+
62+
@Override
63+
public void playSeededSound(@org.jetbrains.annotations.Nullable Player p_220372_, Entity p_220373_, SoundEvent p_220374_, SoundSource p_220375_, float p_220376_, float p_220377_, long p_220378_) {
64+
65+
}
66+
5167
@Override
5268
public void playSound(@Nullable Player p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundSource p_184148_9_, float p_184148_10_, float p_184148_11_) {
5369

@@ -125,6 +141,11 @@ public void levelEvent(@Nullable Player p_217378_1_, int p_217378_2_, BlockPos p
125141

126142
}
127143

144+
@Override
145+
public void gameEvent(GameEvent p_220404_, Vec3 p_220405_, GameEvent.Context p_220406_) {
146+
147+
}
148+
128149
@Override
129150
public void gameEvent(@Nullable Entity p_151549_, GameEvent p_151550_, BlockPos p_151551_) {
130151

‎src/main/java/dev/compactmods/crafting/client/render/ClientProjectorRenderInfo.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package dev.compactmods.crafting.client.render;
22

3-
import java.util.HashMap;
4-
import java.util.Optional;
5-
import java.util.Set;
63
import com.mojang.blaze3d.systems.RenderSystem;
74
import com.mojang.blaze3d.vertex.PoseStack;
8-
import com.mojang.blaze3d.vertex.VertexConsumer;
9-
import dev.compactmods.crafting.CompactCrafting;
105
import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
116
import dev.compactmods.crafting.api.projector.IProjectorRenderInfo;
127
import dev.compactmods.crafting.client.ClientConfig;
@@ -18,17 +13,17 @@
1813
import net.minecraft.client.Minecraft;
1914
import net.minecraft.client.multiplayer.ClientLevel;
2015
import net.minecraft.client.renderer.MultiBufferSource;
21-
import net.minecraft.client.renderer.RenderType;
22-
import net.minecraft.client.renderer.Sheets;
23-
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
2416
import net.minecraft.core.BlockPos;
2517
import net.minecraft.core.Direction;
2618
import net.minecraft.world.level.Level;
2719
import net.minecraft.world.level.block.Blocks;
2820
import net.minecraft.world.level.block.state.BlockBehaviour;
2921
import net.minecraft.world.level.block.state.BlockState;
3022
import net.minecraft.world.phys.Vec3;
31-
import net.minecraftforge.client.model.data.EmptyModelData;
23+
24+
import java.util.HashMap;
25+
import java.util.Optional;
26+
import java.util.Set;
3227

3328
public class ClientProjectorRenderInfo implements IProjectorRenderInfo {
3429

@@ -62,12 +57,7 @@ public void render(PoseStack matrixStack) {
6257
final Camera mainCamera = mc.gameRenderer.getMainCamera();
6358
final ClientLevel level = mc.level;
6459

65-
if(mc.options.graphicsMode == GraphicsStatus.FABULOUS) {
66-
// Fabulous mode is borked, don't bother yet - TODO
67-
render(matrixStack, buffers, mainCamera, level);
68-
} else {
69-
render(matrixStack, buffers, mainCamera, level);
70-
}
60+
render(matrixStack, buffers, mainCamera, level);
7161
}
7262

7363
private void render(PoseStack matrixStack, MultiBufferSource.BufferSource buffers, Camera mainCamera, ClientLevel level) {

‎src/main/java/dev/compactmods/crafting/client/render/GhostRenderer.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package dev.compactmods.crafting.client.render;
22

3-
import javax.annotation.Nullable;
4-
import java.util.Random;
53
import com.mojang.blaze3d.vertex.PoseStack;
64
import com.mojang.blaze3d.vertex.VertexConsumer;
75
import net.minecraft.client.Minecraft;
@@ -17,7 +15,10 @@
1715
import net.minecraft.util.FastColor;
1816
import net.minecraft.util.Mth;
1917
import net.minecraft.world.level.block.state.BlockState;
20-
import net.minecraftforge.client.model.data.EmptyModelData;
18+
import net.minecraftforge.client.model.data.ModelData;
19+
20+
import javax.annotation.Nullable;
21+
import java.util.Random;
2122

2223
public class GhostRenderer {
2324
public static void renderTransparentBlock(BlockState state, @Nullable BlockPos pos, PoseStack matrix, MultiBufferSource buffer) {
@@ -36,10 +37,10 @@ public static void renderTransparentBlock(BlockState state, @Nullable BlockPos p
3637
BakedModel model = dispatcher.getBlockModel(state);
3738
if (model != mc.getModelManager().getMissingModel()) {
3839
for(Direction dir : Direction.values())
39-
model.getQuads(state, dir, new Random(42L), EmptyModelData.INSTANCE)
40+
model.getQuads(state, dir, mc.level.random, ModelData.EMPTY, null)
4041
.forEach(quad -> addQuad(state, pos, matrix, mc, colors, builder, quad, alpha));
4142

42-
model.getQuads(state, null, new Random(42L), EmptyModelData.INSTANCE)
43+
model.getQuads(state, null, mc.level.random, ModelData.EMPTY, null)
4344
.forEach(quad -> addQuad(state, pos, matrix, mc, colors, builder, quad, alpha));
4445
}
4546
}
@@ -58,6 +59,6 @@ private static void addQuad(BlockState state, @Nullable BlockPos pos, PoseStack
5859
green,
5960
blue,
6061
trueAlpha,
61-
LightTexture.FULL_SKY, OverlayTexture.NO_OVERLAY);
62+
LightTexture.FULL_SKY, OverlayTexture.NO_OVERLAY, false);
6263
}
6364
}

‎src/main/java/dev/compactmods/crafting/client/ui/container/ContainerRegistration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class ContainerRegistration {
1313

1414
public static final DeferredRegister<MenuType<?>> CONTAINERS =
15-
DeferredRegister.create(ForgeRegistries.CONTAINERS, CompactCrafting.MOD_ID);
15+
DeferredRegister.create(ForgeRegistries.MENU_TYPES, CompactCrafting.MOD_ID);
1616

1717
public static final RegistryObject<MenuType<TestContainer>> TEST_CONTAINER = CONTAINERS.register("test",
1818
() -> IForgeMenuType.create((windowId, inv, data) -> {

0 commit comments

Comments
 (0)