Port to new create version

Author: cakeGit

build.gradle

@@ -11,7 +11,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.9.420" apply false
     id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
     id "me.modmuss50.mod-publish-plugin" version "0.6.3"
 }

common/build.gradle

@@ -1,12 +1,16 @@
 architectury {
     common(rootProject.enabled_platforms.split(","))
+    platformSetupLoomIde()
+    forge()
 }
 
 loom {
     accessWidenerPath = file("src/main/resources/pattern_schematics.accesswidener")
+    forge {}
 }
 
 repositories {
+    mavenCentral()
     // mavens for Create Fabric and dependencies
     maven { url = "https://api.modrinth.com/maven" } // LazyDFU
     maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu
@@ -15,18 +19,31 @@ repositories {
     maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port
     maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
     maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
+    maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
+    maven { url = "https://maven.tterrag.com" } // Registrate
+    maven { url = "https://repo.spongepowered.org/maven/" } // Mixin
 }
 
 dependencies {
+    forge("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
-    modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
+//    modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
     // Compile against Create Fabric in common
     // beware of differences across platforms!
     // dependencies must also be pulled in to minimize problems, from remapping issues to compile errors.
     // All dependencies except Flywheel and Registrate are NOT safe to use!
     // Flywheel and Registrate must also be used carefully due to differences.
-    modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
+//    modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
+
+
+    // Create and its dependencies
+    implementation 'org.spongepowered:mixin:0.8.7'
+    compileOnly('com.google.code.findbugs:jsr305:3.0.2')
+    modCompileOnly("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
+    modCompileOnly("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
+    modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
+    modCompileOnly("com.tterrag.registrate:Registrate:${registrate_version}")
 }
 
 publishing {

common/gradle.properties

@@ -0,0 +1 @@
+loom.platform=forge

common/src/main/java/com/cak/pattern_schematics/PatternSchematics.java

@@ -5,11 +5,10 @@
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.foundation.item.ItemDescription;
 import com.simibubi.create.foundation.item.KineticStats;
-import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipModifier;
+import net.createmod.catnip.lang.FontHelper;
 import net.minecraft.resources.ResourceLocation;
 
-// The value here should match an entry in the META-INF/mods.toml file
 public class PatternSchematics {
 
     public static final String MOD_ID = "create_pattern_schematics";
@@ -18,7 +17,7 @@ public class PatternSchematics {
 
     static {
         REGISTRATE.setTooltipModifierFactory(item ->
-            new ItemDescription.Modifier(item, TooltipHelper.Palette.STANDARD_CREATE)
+            new ItemDescription.Modifier(item, FontHelper.Palette.STANDARD_CREATE)
                 .andThen(TooltipModifier.mapNull(KineticStats.create(item)))
         );
     }

common/src/main/java/com/cak/pattern_schematics/PatternSchematicsClient.java

@@ -1,9 +1,9 @@
 package com.cak.pattern_schematics;
 
-import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderTags;
-import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderIndex;
 import com.cak.pattern_schematics.foundation.mirror.PatternSchematicHandler;
 import com.cak.pattern_schematics.registry.PlatformPackets;
+import com.simibubi.create.foundation.ponder.CreatePonderPlugin;
+import net.createmod.ponder.foundation.PonderIndex;
 
 public class PatternSchematicsClient {
 
@@ -12,11 +12,7 @@ public class PatternSchematicsClient {
 
   public static void init() {
     PlatformPackets.getChannel().initClientListener();
-  }
-  
-  public static void setup() {
-    PatternSchematicsPonderTags.register();
-    PatternSchematicsPonderIndex.register();
+    PonderIndex.addPlugin(new CreatePonderPlugin());
   }
 
 }

common/src/main/java/com/cak/pattern_schematics/PatternSchematicsClientEvents.java

@@ -1,10 +1,9 @@
 package com.cak.pattern_schematics;
 
-import com.jozufozu.flywheel.event.RenderLayerEvent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
-import com.simibubi.create.foundation.utility.AnimationTickHolder;
+import net.createmod.catnip.render.DefaultSuperRenderTypeBuffer;
+import net.createmod.catnip.render.SuperRenderTypeBuffer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.phys.Vec3;
 
@@ -16,19 +15,20 @@ public static void onTick() {
         PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER.tick();
     }
 
-    public static void renderPatternSchematic(PoseStack stack) {
-        stack.pushPose();
-        
-        SuperRenderTypeBuffer buffer = SuperRenderTypeBuffer.getInstance();
-        
+    public static void renderPatternSchematic(PoseStack ms) {
+        ms.pushPose();
+
+        ms.pushPose();
+        SuperRenderTypeBuffer buffer = DefaultSuperRenderTypeBuffer.getInstance();
+
         Vec3 camera = Minecraft.getInstance().gameRenderer.getMainCamera()
             .getPosition();
 
-        PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER.render(stack, buffer, camera);
+        PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER.render(ms, buffer, camera);
 
         buffer.draw();
         RenderSystem.enableCull();
-        stack.popPose();
+        ms.popPose();
     }
 
     public static void onKeyInput(int key, boolean pressed) {

common/src/main/java/com/cak/pattern_schematics/content/item/PatternSchematicItem.java

@@ -3,11 +3,10 @@
 import com.cak.pattern_schematics.registry.PatternSchematicsRegistry;
 import com.simibubi.create.content.schematics.SchematicItem;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.HolderGetter;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 
@@ -17,7 +16,7 @@ public PatternSchematicItem(Properties properties) {
     super(properties);
   }
 
-  public static ItemStack create(HolderGetter<Block> lookup, String schematic, String owner) {
+  public static ItemStack create(Level lookup, String schematic, String owner) {
     ItemStack blueprint = PatternSchematicsRegistry.PATTERN_SCHEMATIC.asStack();
 
     CompoundTag tag = new CompoundTag();