Port to 1.19.2

McJty · Aug 8, 2022 · 7fe99a7 · 7fe99a7
1 parent 270ff33
commit 7fe99a7
Show file tree

Hide file tree

Showing 82 changed files with 1,225 additions and 656 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,8 @@ minecraft {
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'parchment', version: "1.18.1-2022.03.06-1.18.2"
+    //mappings channel: 'parchment', version: "1.18.1-2022.03.06-1.18.2"
+    mappings channel: 'official', version: "1.19.2"
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     // Default run configurations.
@@ -123,20 +124,25 @@ repositories {
         url "https://dvs1.progwml6.com/files/maven"
     }
     maven { // TOP
-        url "https://cursemaven.com"
+        url "https://maven.k-4u.nl"
     }
 }
 
 dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.2-40.0.12'
+    minecraft 'net.minecraftforge:forge:1.19.2-43.0.0'
 
-    compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
-    implementation fg.deobf("mezz.jei:jei-${jei_version}")
+    // compile against the JEI API but do not include it at runtime
+    compileOnly fg.deobf("mezz.jei:jei-1.19.1-common-api:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-1.19.1-forge-api:${jei_version}")
+    // at runtime, use the full JEI jar for Forge
+    runtimeOnly fg.deobf("mezz.jei:jei-1.19.1-forge:${jei_version}")
 
-    implementation fg.deobf("curse.maven:the-one-probe-245211:3550084")
+    implementation fg.deobf(project.dependencies.create("mcjty.theoneprobe:theoneprobe:${top_version}") {
+        transitive = false
+    })
 }
 
 // Example for how to get properties into the manifest for reading at runtime.

diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,5 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-jei_version=1.18.2:9.5.0.125
+jei_version=11.2.0.244
+top_version=1.19-6.2.0-6
diff --git a/src/generated/resources/assets/tutorialv3/blockstates/generator.json b/src/generated/resources/assets/tutorialv3/blockstates/generator.json
@@ -4,8 +4,10 @@
       "model": "tutorialv3:block/generator",
       "x": 180
     },
-    "facing=up": {
-      "model": "tutorialv3:block/generator"
+    "facing=east": {
+      "model": "tutorialv3:block/generator",
+      "x": 90,
+      "y": 90
     },
     "facing=north": {
       "model": "tutorialv3:block/generator",
@@ -16,15 +18,13 @@
       "x": 90,
       "y": 180
     },
+    "facing=up": {
+      "model": "tutorialv3:block/generator"
+    },
     "facing=west": {
       "model": "tutorialv3:block/generator",
       "x": 90,
       "y": 270
-    },
-    "facing=east": {
-      "model": "tutorialv3:block/generator",
-      "x": 90,
-      "y": 90
     }
   }
 }
diff --git a/src/generated/resources/assets/tutorialv3/blockstates/powergen.json b/src/generated/resources/assets/tutorialv3/blockstates/powergen.json
@@ -6,113 +6,113 @@
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff"
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff",
         "x": 180
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff",
         "x": 90
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff",
         "x": 270
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff",
         "x": 90,
         "y": 90
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "false"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleoff",
         "x": 90,
         "y": 270
+      },
+      "when": {
+        "powered": "false"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon"
+      },
+      "when": {
+        "powered": "true"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon",
         "x": 180
+      },
+      "when": {
+        "powered": "true"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon",
         "x": 90
+      },
+      "when": {
+        "powered": "true"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon",
         "x": 270
+      },
+      "when": {
+        "powered": "true"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon",
         "x": 90,
         "y": 90
+      },
+      "when": {
+        "powered": "true"
       }
     },
     {
-      "when": {
-        "powered": "true"
-      },
       "apply": {
         "model": "tutorialv3:block/powergen/singleon",
         "x": 90,
         "y": 270
+      },
+      "when": {
+        "powered": "true"
       }
     }
   ]

diff --git a/src/generated/resources/assets/tutorialv3/models/block/portal.json b/src/generated/resources/assets/tutorialv3/models/block/portal.json
@@ -2,10 +2,10 @@
   "parent": "minecraft:block/cube",
   "textures": {
     "down": "tutorialv3:block/portal_side",
-    "up": "tutorialv3:block/portal_top",
+    "east": "tutorialv3:block/portal_side",
     "north": "tutorialv3:block/portal_side",
     "south": "tutorialv3:block/portal_side",
-    "east": "tutorialv3:block/portal_side",
+    "up": "tutorialv3:block/portal_top",
     "west": "tutorialv3:block/portal_side"
   }
 }