Initial updates for 1.18.2

Author: robotgryphon

build.gradle

@@ -275,33 +275,33 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}")
 
     // The One Probe
-    implementation(fg.deobf("curse.maven:theoneprobe-245211:3550084"))
+    implementation(fg.deobf("curse.maven:theoneprobe-245211:3671753"))
 //    compileOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}:api")
 //    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
 
     // Nicephore - Screenshots and Stuff
-    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3574658"))
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3651214"))
 
     // Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
     runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
 
-    // Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
-    runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3649270"))
-    runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3597654"))
-    runtimeOnly(fg.deobf("curse.maven:pipez-443900:3569514"))
-    runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3687357"))
-    runtimeOnly(fg.deobf("curse.maven:create-328085:3687358"))
-    runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
-    runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
-    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
-
-    // Scalable Cat's Force, BdLib, Advanced Generators
-    runtimeOnly(fg.deobf("curse.maven:scalable-320926:3634756"))
-    runtimeOnly(fg.deobf("curse.maven:bdlib-70496:3663149"))
-    runtimeOnly(fg.deobf("curse.maven:advgen-223622:3665335"))
-
-    // Immersive Eng - 7.1.0-145 (Dec 31)
-    runtimeOnly(fg.deobf("curse.maven:immersiveeng-231951:3587149"))
+//    // Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
+//    runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3649270"))
+//    runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3597654"))
+//    runtimeOnly(fg.deobf("curse.maven:pipez-443900:3569514"))
+//    runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3687357"))
+//    runtimeOnly(fg.deobf("curse.maven:create-328085:3687358"))
+//    runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
+//    runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
+//    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
+//
+//    // Scalable Cat's Force, BdLib, Advanced Generators
+//    runtimeOnly(fg.deobf("curse.maven:scalable-320926:3634756"))
+//    runtimeOnly(fg.deobf("curse.maven:bdlib-70496:3663149"))
+//    runtimeOnly(fg.deobf("curse.maven:advgen-223622:3665335"))
+//
+//    // Immersive Eng - 7.1.0-145 (Dec 31)
+//    runtimeOnly(fg.deobf("curse.maven:immersiveeng-231951:3587149"))
 
     // Mekanism + Mek Generators - Tunnel testing
 //    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))

gradle.properties

@@ -3,14 +3,14 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.18.1
-forge_version=39.0.88
+minecraft_version=1.18.2
+forge_version=40.0.18
 
 mod_id=compactmachines
 
 # Dependencies and Libs
-jei_mc_version=1.18.1
-jei_version=9.4.1.106
+jei_mc_version=1.18.2
+jei_version=9.5.2.135
 #top_version=1.16-3.1.4-22
 
 # Curseforge

src/api/java/dev/compactmods/machines/api/tunnels/recipe/TunnelRecipeBuilder.java

@@ -12,8 +12,6 @@
 import net.minecraft.advancements.critereon.RecipeUnlockedTrigger;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
@@ -43,10 +41,6 @@ public static TunnelRecipeBuilder tunnel(TunnelDefinition definition, int count)
         return new TunnelRecipeBuilder(definition, count);
     }
 
-    public TunnelRecipeBuilder requires(Tag<Item> itemTag) {
-        return this.requires(Ingredient.of(itemTag));
-    }
-
     public TunnelRecipeBuilder requires(ItemLike item) {
         return this.requires(Ingredient.of(item));
     }

src/datagen/java/dev/compactmods/machines/datagen/DimensionTypeBuilder.java

@@ -1,10 +1,13 @@
 package dev.compactmods.machines.datagen;
 
-import java.util.OptionalLong;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.dimension.DimensionType;
 
+import java.util.OptionalLong;
+
 /**
  * Used for building dimension types, since Mojang hasn't provided one.
  * By default, this pulls all the overworld values. See {@link DimensionType#DEFAULT_OVERWORLD} for more info,
@@ -24,7 +27,7 @@ public class DimensionTypeBuilder {
     private int minY = 0;
     private int height = 256;
     private int logicalHeight = 256;
-    private ResourceLocation infiniburn = BlockTags.INFINIBURN_OVERWORLD.getName();
+    private TagKey<Block> infiniburn = BlockTags.INFINIBURN_OVERWORLD;
     private ResourceLocation effectsLocation = DimensionType.OVERWORLD_EFFECTS;
     private float ambientLight = 0;
 
@@ -104,7 +107,7 @@ public DimensionTypeBuilder heightBounds(int min, int height, int logicalHeight)
         return this;
     }
 
-    public DimensionTypeBuilder infiniburn(ResourceLocation infiburn) {
+    public DimensionTypeBuilder infiniburn(TagKey<Block> infiburn) {
         this.infiniburn = infiburn;
         return this;
     }

src/datagen/java/dev/compactmods/machines/datagen/LevelBiomeGenerator.java

@@ -8,7 +8,9 @@
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
 import dev.compactmods.machines.CompactMachines;
+import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DataProvider;
@@ -24,13 +26,13 @@
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.StructureSettings;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
 
 import javax.annotation.Nonnull;
 import java.nio.file.Path;
 import java.util.HashMap;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 
 public class LevelBiomeGenerator implements DataProvider {
@@ -87,16 +89,17 @@ private JsonElement writeFlatDimension(LevelStem dimension) {
     }
 
     private void writeDimensions(HashMap<ResourceLocation, Biome> biomes, HashMap<ResourceLocation, DimensionType> dimTypes, BiConsumer<LevelStem, ResourceLocation> consumer) {
-        var struct = new StructureSettings(false);
-        struct.structureConfig().clear();
 
-        var flatSettings = new FlatLevelGeneratorSettings(struct, BuiltinRegistries.BIOME);
+        RegistryAccess.Frozen reg = RegistryAccess.BUILTIN.get();
+        final var ssreg = reg.registryOrThrow(Registry.STRUCTURE_SET_REGISTRY);
 
-        flatSettings.setBiome(() -> biomes.get(COMPACT_BIOME));
+        var flatSettings = new FlatLevelGeneratorSettings(Optional.empty(), BuiltinRegistries.BIOME);
+
+        flatSettings.setBiome(Holder.direct(biomes.get(COMPACT_BIOME)));
         flatSettings.getLayersInfo().add(new FlatLayerInfo(1, Blocks.AIR));
         flatSettings.updateLayers();
 
-        var stem = new LevelStem(() -> dimTypes.get(COMPACT_LEVEL), new FlatLevelSource(flatSettings));
+        var stem = new LevelStem(Holder.direct(dimTypes.get(COMPACT_LEVEL)), new FlatLevelSource(ssreg, flatSettings));
         consumer.accept(stem, COMPACT_LEVEL);
     }
 

src/datagen/java/dev/compactmods/machines/datagen/RecipeGenerator.java

@@ -9,9 +9,10 @@
 import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.crafting.ConditionalRecipe;
@@ -46,7 +47,7 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
                 .save(consumer);
 
         TunnelRecipeBuilder.tunnel(Tunnels.ITEM_TUNNEL_DEF.get(), 2)
-                .requires(Tags.Items.CHESTS)
+                .requires(Ingredient.of(Tags.Items.CHESTS))
                 .requires(Items.ENDER_PEARL)
                 .requires(Items.REDSTONE)
                 .requires(Items.OBSERVER)
@@ -81,7 +82,7 @@ private void addMachineRecipes(Consumer<FinishedRecipe> consumer) {
         registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_MAXIMUM.get(), Tags.Items.STORAGE_BLOCKS_EMERALD);
     }
 
-    protected void registerMachineRecipe(Consumer<FinishedRecipe> consumer, ItemLike out, Tag<Item> center) {
+    protected void registerMachineRecipe(Consumer<FinishedRecipe> consumer, ItemLike out, TagKey<Item> center) {
         Item wall = Registration.ITEM_BREAKABLE_WALL.get();
         ShapedRecipeBuilder recipe = ShapedRecipeBuilder.shaped(out)
                 .pattern("WWW");

src/main/java/dev/compactmods/machines/core/Tunnels.java

@@ -30,14 +30,11 @@ public class Tunnels {
 
     // region Setup
 
-    @SuppressWarnings("unchecked")
     public static final DeferredRegister<TunnelDefinition> DEFINITIONS = DeferredRegister.create(TunnelDefinition.class, MOD_ID);
 
-    @SuppressWarnings("unchecked")
     public static final Supplier<IForgeRegistry<TunnelDefinition>> TUNNEL_DEF_REGISTRY = DEFINITIONS.makeRegistry("tunnel_types",
             () -> new RegistryBuilder<TunnelDefinition>()
-                    .setType((Class) TunnelDefinition.class)
-                    .tagFolder("tunnel_types"));
+                    .setType(TunnelDefinition.class));
 
     public static void init(IEventBus bus) {
         DEFINITIONS.register(bus);

src/main/java/dev/compactmods/machines/util/DimensionUtil.java

@@ -1,17 +1,12 @@
 package dev.compactmods.machines.util;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.concurrent.Executor;
 import com.google.common.collect.ImmutableList;
 import com.mojang.serialization.JsonOps;
-import com.mojang.serialization.Lifecycle;
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.core.Registration;
+import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.RegistryReadOps;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.RegistryResourceAccess;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
@@ -29,6 +24,12 @@
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.Executor;
+
 public class DimensionUtil {
 
     @SuppressWarnings("deprecation") // because we call the forge internal method server#markWorldsDirty
@@ -50,7 +51,7 @@ public static void createAndRegisterWorldAndDimension(final MinecraftServer serv
         var cmDimType = reg.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY)
                 .get(Registration.COMPACT_DIMENSION_DIM_TYPE);
 
-        var ops = RegistryReadOps.create(JsonOps.INSTANCE, serverResources, reg);
+        var ops = RegistryOps.create(JsonOps.INSTANCE, reg);
 
         var resourceAccess = RegistryResourceAccess.forResourceManager(serverResources);
         var dims = resourceAccess.listResources(Registry.DIMENSION_REGISTRY);
@@ -80,7 +81,7 @@ public static void createAndRegisterWorldAndDimension(final MinecraftServer serv
             // then instantiate level, add border listener, add to map, fire world load event
 
             // register the actual dimension
-            worldGenSettings.dimensions().register(dimensionKey, stem, Lifecycle.experimental());
+            worldGenSettings.dimensions().register(reg.registryOrThrow(Registry.LEVEL_STEM_REGISTRY), dimensionKey, stem);
 
             // create the world instance
             final ServerLevel newWorld = new ServerLevel(
@@ -89,7 +90,7 @@ public static void createAndRegisterWorldAndDimension(final MinecraftServer serv
                     anvilConverter,
                     derivedLevelData,
                     Registration.COMPACT_DIMENSION,
-                    cmDimType,
+                    Holder.direct(cmDimType),
                     chunkProgressListener,
                     stem.generator(),
                     worldGenSettings.isDebug(),

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

@@ -4,6 +4,9 @@ public net.minecraft.world.level.chunk.ChunkBiomeContainer f_62112_ # biomes
 public net.minecraft.world.level.storage.DimensionDataStorage m_78156_(Ljava/lang/String;)Ljava/io/File; # getDataFile
 public net.minecraft.world.level.storage.DimensionDataStorage f_78144_ # cache
 
+# Forge Missing
+protected net.minecraft.data.recipes.RecipeProvider m_206406_(Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/InventoryChangeTrigger$TriggerInstance; # has
+
 # Fix Dimension Command
 public net.minecraft.server.MinecraftServer f_129738_ # executor
 public net.minecraft.server.MinecraftServer f_129744_ # storageSource