1.15 port start

build.gradle

@@ -21,6 +21,8 @@ apply plugin: 'maven'
 group = "mrtjp"
 archivesBaseName = "ProjectRed"
 
+sourceSets.main.resources.srcDirs += "src/main/generated"
+
 ext.configFile = file "build.properties"
 configFile.withReader {
     // Load config.  It shall from now be referenced as simply config or project.config
@@ -55,12 +57,17 @@ dependencies {
 
     compile "mrtjp:MrTJPCore:${config.mc_version}-${config.tjpcore_version}:deobf"
     compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:deobf"
-    compile "codechicken:ForgeMultipart:${config.mc_version}-${config.fmp_version}:deobf"
+    compile "codechicken:CBMultipart:1.15.2-2.7.0.87:deobf"
+
+    compile "org.scala-lang:scala-compiler:${config.scala_version}"
+    compile "org.scala-lang:scala-library:${config.scala_version}"
+    compile "org.scala-lang.modules:scala-java8-compat_${config.scala_compat_version}"
+    compile "net.minecraftforge:Scorge:${config.scorge_version}"
 
     // compile against the JEI API
-    deobfCompile "mezz.jei:jei_${config.mc_version}:${config.jei_version}:api"
+    deobfCompile "mezz.jei:jei-1.15.2:6.0.3.+"
     // at runtime, use the full JEI jar
-    runtime "mezz.jei:jei_${config.mc_version}:${config.jei_version}"
+//     runtime "mezz.jei:jei_${config.mc_version}:${config.jei_version}"
 }
 
 def build_number = project.hasProperty("manualbuildnum") ? project.manualbuildnum : (Integer.parseInt(System.getenv("BUILD_NUMBER") ?: "1")).toString()
@@ -75,17 +82,17 @@ minecraft {
     useDepAts = true
 }
 
-sourceSets {
-    main {
-        def root = project.projectDir
-        scala {
-            srcDir new File(root, "src")
-        }
-        resources {
-            srcDir new File(root, "resources")
-        }
-    }
-}
+// sourceSets {
+//     main {
+//         def root = project.projectDir
+//         scala {
+//             srcDir new File(root, "src")
+//         }
+//         resources {
+//             srcDir new File(root, "resources")
+//         }
+//     }
+// }
 
 processResources {
     //redo task if any of these properties change

build.properties

@@ -8,3 +8,8 @@ tjpcore_version=2.1.4.+
 fmp_version=2.6.1.+
 
 jei_version=4.15.0.+
+
+
+scala_version=2.13.1
+scala_compat_version=2.13:0.9.0
+scorge_version=3.1.2

src/main/generated/assets/projectred-core/models/item/anode.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/anode"
+  }
+}

src/main/generated/assets/projectred-core/models/item/black_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/black_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/blue_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/blue_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/boule.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/boule"
+  }
+}

src/main/generated/assets/projectred-core/models/item/brown_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/brown_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/bundled_plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/bundled_plate"
+  }
+}

src/main/generated/assets/projectred-core/models/item/cathode.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/cathode"
+  }
+}

src/main/generated/assets/projectred-core/models/item/conductive_plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/conductive_plate"
+  }
+}

src/main/generated/assets/projectred-core/models/item/copper_coil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/copper_coil"
+  }
+}

src/main/generated/assets/projectred-core/models/item/copper_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/copper_ingot"
+  }
+}

src/main/generated/assets/projectred-core/models/item/cyan_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/cyan_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/draw_plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "projectred-core:item/draw_plate"
+  }
+}

src/main/generated/assets/projectred-core/models/item/electrotine_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/electrotine_dust"
+  }
+}

src/main/generated/assets/projectred-core/models/item/electrotine_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/electrotine_ingot"
+  }
+}

src/main/generated/assets/projectred-core/models/item/electrotine_iron_comp.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/electrotine_iron_comp"
+  }
+}

src/main/generated/assets/projectred-core/models/item/electrotine_silicon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/electrotine_silicon"
+  }
+}

src/main/generated/assets/projectred-core/models/item/electrotine_silicon_comp.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/electrotine_silicon_comp"
+  }
+}

src/main/generated/assets/projectred-core/models/item/energized_silicon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/energized_silicon"
+  }
+}

src/main/generated/assets/projectred-core/models/item/energized_silicon_chip.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/energized_silicon_chip"
+  }
+}

src/main/generated/assets/projectred-core/models/item/glow_silicon_comp.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/glow_silicon_comp"
+  }
+}

src/main/generated/assets/projectred-core/models/item/gold_coil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/gold_coil"
+  }
+}

src/main/generated/assets/projectred-core/models/item/gray_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/gray_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/green_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/green_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/infused_silicon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/infused_silicon"
+  }
+}

src/main/generated/assets/projectred-core/models/item/iron_coil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/iron_coil"
+  }
+}

src/main/generated/assets/projectred-core/models/item/light_blue_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/light_blue_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/light_gray_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/light_gray_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/lime_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/lime_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/magenta_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/magenta_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/motor.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/motor"
+  }
+}

src/main/generated/assets/projectred-core/models/item/multimeter.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "projectred-core:item/multimeter"
+  }
+}

src/main/generated/assets/projectred-core/models/item/null_routing_chip.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/null_routing_chip"
+  }
+}

src/main/generated/assets/projectred-core/models/item/orange_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/orange_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/peridot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/peridot"
+  }
+}

src/main/generated/assets/projectred-core/models/item/pink_illumar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/illumar/pink_illumar"
+  }
+}

src/main/generated/assets/projectred-core/models/item/plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/plate"
+  }
+}

src/main/generated/assets/projectred-core/models/item/platformed_plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/platformed_plate"
+  }
+}

src/main/generated/assets/projectred-core/models/item/pointer.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "projectred-core:item/pointer"
+  }
+}