Ported to 1.19.2, create 0.5.0.e

DM-Fabric-Ports · Sep 26, 2022 · e2bcc49 · e2bcc49
1 parent b45e6bb
commit e2bcc49
Show file tree

Hide file tree

Showing 145 changed files with 833 additions and 962 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,20 +7,19 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forgegradle_version}", changing: false
         classpath "org.parchmentmc:librarian:${librarian_version}"
         classpath "org.spongepowered:mixingradle:${mixingradle_version}"
     }
 }
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 plugins {
-    id 'eclipse'
-    id 'maven-publish'
+    id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
 }
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'org.spongepowered.mixin'
-
+apply plugin: 'maven-publish'
 
 version = '1.0'
 group = 'com.cyvack.create_crystal_clear' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -92,32 +91,39 @@ repositories {
         }
 
         maven {
-            //CREATE
+            //REGISTRATE / CREATE
             name = 'tterrag maven'
             url = 'https://maven.tterrag.com/'
         }
 
-        maven {
-        // JEI
-        name 'Progwm16 maven'
+    maven {
+        // Location of the maven that hosts JEI files (and TiC)
+        name 'Progwml6 maven'
         url 'https://dvs1.progwml6.com/files/maven'
-        }
+    }
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
+
+//    jarJar(group: 'com.tterrag.registrate', name: 'Registrate', version: '[MC1.19-1.1.5,)') {
+//        jarJar.pin(it, project.registrate_version)
+//    }
+
+
     //CREATE
-    implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:all") { transitive = false }
+    implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
     implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
-    compileOnly fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
+    implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
 
     //ALLOYED
-    implementation fg.deobf("curse.maven:alloyed-564792:3943197")
+//    implementation fg.deobf("curse.maven:alloyed-564792:3943197")
 
     //JEI
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge:${jei_version}")
 
 
     //RUBIDIUM AND SHADERS

diff --git a/gradle.properties b/gradle.properties
@@ -3,20 +3,23 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version = 1.18.2
-forge_version = 40.1.60
+minecraft_version = 1.19.2
+forge_version = 43.1.0
+forgegradle_version = 5.1.53
+cursegradle_version = 1.4.0
 
 modid = create_crystal_clear
 
 mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 
 librarian_version = 1.+
-parchment_version = 2022.07.10
+parchment_version = 2022.08.10
 
-jei_version = 9.7.0.209
-create_minecraft_version = 1.18.2
-flywheel_minecraft_version = 1.18.2
-create_version = 0.5.0.d-168
-flywheel_version = 0.6.5-91
-registrate_version = MC1.18.2-1.1.3
+jei_minecraft_version = 1.19.2
+jei_version = 11.2.0.254
+create_minecraft_version = 1.19.2
+flywheel_minecraft_version =  1.19.2
+create_version = 0.5.0.e-13
+flywheel_version = 0.6.6-6
+registrate_version = MC1.19-1.1.5
diff --git a/src/generated/resources/.cache/3f8fa40677dc4df030449611a8b735091e46d6db b/src/generated/resources/.cache/3f8fa40677dc4df030449611a8b735091e46d6db
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/...ources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json b/...ources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json
@@ -5,47 +5,47 @@
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel"
-    },
-    "axis=z,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel",
+    "axis=x,bottom_shaft=false,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top",
       "x": 90,
-      "y": 180
+      "y": 90
     },
     "axis=x,bottom_shaft=true,top_shaft=false": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom",
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom"
-    },
-    "axis=z,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom",
-      "x": 90,
-      "y": 180
-    },
-    "axis=x,bottom_shaft=false,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top",
+    "axis=x,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom",
       "x": 90,
       "y": 90
     },
+    "axis=y,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel"
+    },
     "axis=y,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top"
     },
+    "axis=y,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom"
+    },
+    "axis=y,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom"
+    },
+    "axis=z,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel",
+      "x": 90,
+      "y": 180
+    },
     "axis=z,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top",
       "x": 90,
       "y": 180
     },
-    "axis=x,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom",
+    "axis=z,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom",
       "x": 90,
-      "y": 90
-    },
-    "axis=y,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom"
+      "y": 180
     },
     "axis=z,bottom_shaft=true,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom",

diff --git a/.../assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json b/.../assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json
@@ -5,47 +5,47 @@
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel"
-    },
-    "axis=z,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel",
+    "axis=x,bottom_shaft=false,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top",
       "x": 90,
-      "y": 180
+      "y": 90
     },
     "axis=x,bottom_shaft=true,top_shaft=false": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom",
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom"
-    },
-    "axis=z,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom",
-      "x": 90,
-      "y": 180
-    },
-    "axis=x,bottom_shaft=false,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top",
+    "axis=x,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom",
       "x": 90,
       "y": 90
     },
+    "axis=y,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel"
+    },
     "axis=y,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top"
     },
+    "axis=y,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom"
+    },
+    "axis=y,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom"
+    },
+    "axis=z,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel",
+      "x": 90,
+      "y": 180
+    },
     "axis=z,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top",
       "x": 90,
       "y": 180
     },
-    "axis=x,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom",
+    "axis=z,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom",
       "x": 90,
-      "y": 90
-    },
-    "axis=y,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom"
+      "y": 180
     },
     "axis=z,bottom_shaft=true,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom",

diff --git a/...resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json b/...resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json
@@ -2,19 +2,19 @@
   "variants": {
     "axis=x": {
       "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass",
+      "uvlock": true,
       "x": 90,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "axis=y": {
       "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass",
       "uvlock": true
     },
     "axis=z": {
       "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass",
+      "uvlock": true,
       "x": 90,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     }
   }
 }
diff --git a/...ed/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json b/...ed/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json
@@ -5,47 +5,47 @@
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel"
-    },
-    "axis=z,bottom_shaft=false,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel",
+    "axis=x,bottom_shaft=false,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top",
       "x": 90,
-      "y": 180
+      "y": 90
     },
     "axis=x,bottom_shaft=true,top_shaft=false": {
       "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom",
       "x": 90,
       "y": 90
     },
-    "axis=y,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom"
-    },
-    "axis=z,bottom_shaft=true,top_shaft=false": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom",
-      "x": 90,
-      "y": 180
-    },
-    "axis=x,bottom_shaft=false,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top",
+    "axis=x,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom",
       "x": 90,
       "y": 90
     },
+    "axis=y,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel"
+    },
     "axis=y,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top"
     },
+    "axis=y,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom"
+    },
+    "axis=y,bottom_shaft=true,top_shaft=true": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom"
+    },
+    "axis=z,bottom_shaft=false,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel",
+      "x": 90,
+      "y": 180
+    },
     "axis=z,bottom_shaft=false,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top",
       "x": 90,
       "y": 180
     },
-    "axis=x,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom",
+    "axis=z,bottom_shaft=true,top_shaft=false": {
+      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom",
       "x": 90,
-      "y": 90
-    },
-    "axis=y,bottom_shaft=true,top_shaft=true": {
-      "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom"
+      "y": 180
     },
     "axis=z,bottom_shaft=true,top_shaft=true": {
       "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom",