Merge pull request #119 from TropheusJ/1.19.4

Refactor prop destruction and loot
Fusion-Flux · Jun 20, 2023 · f976a37 · f976a37
2 parents da67dc7 + 4723418
commit f976a37
Show file tree

Hide file tree

Showing 33 changed files with 695 additions and 25 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -90,6 +90,8 @@ dependencies {
 		isTransitive = false
 	})
 
+	modLocalRuntime("maven.modrinth:cloth-config:10.0.96+fabric")
+
 	include(modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.1.0") {
 		exclude(group = "net.fabricmc.fabric-api")
 		exclude(group = "net.fabricmc")
@@ -102,7 +104,7 @@ dependencies {
 
 //	modCompileOnly("com.simibubi.create:create-fabric-1.19.2:0.5.0.i-930+1.19.2")
 
-	modCompileOnly("maven.modrinth:visible-barriers:2.0.1")
+	modCompileOnly("maven.modrinth:visiblebarriers:2.0.1")
 
 	include(implementation("net.objecthunter:exp4j:0.4.8")!!)
 
@@ -123,6 +125,24 @@ dependencies {
 
 loom {
 	accessWidenerPath.set(file("src/main/resources/portalcubed.accesswidener"))
+	runs {
+		create("datagen") {
+			client()
+			name("Data Generation")
+			vmArg("-Dfabric-api.datagen")
+			vmArg("-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}")
+			vmArg("-Dfabric-api.datagen.modid=portalcubed")
+		}
+	}
+}
+
+sourceSets {
+	main {
+		resources {
+			srcDir("src/generated/resources")
+			exclude("src/generated/resources/.cache")
+		}
+	}
 }
 
 checkstyle {

diff --git a/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e b/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e
@@ -0,0 +1,26 @@
+// 1.19.4	2023-06-20T02:18:16.635105	Portal Cubed/minecraft:entity Loot Table
+86318041d1ac315fabfc88090d936e86682580c3 data\portalcubed\loot_tables\entities\jug.json
+b6b91f589e96c00755552126be8649b5ba0f2aeb data\portalcubed\loot_tables\entities\space_core.json
+fd2fc0a38a7350cb98dd9a515cc4616df5f298c8 data\portalcubed\loot_tables\entities\beans.json
+9a319d32af74012091ff2ebeb7dfc4cc2900c217 data\portalcubed\loot_tables\entities\old_ap_cube.json
+8ec3addaf3236aa2d33881c96dc45bf44984046d data\portalcubed\loot_tables\entities\portal_1_storage_cube.json
+fb9d054a28d17044419f7497f273490cd284471b data\portalcubed\loot_tables\entities\mug.json
+d973ae191dc2028412755414dfd96a6e0f8757a3 data\portalcubed\loot_tables\entities\portal_1_companion_cube.json
+dbe4700abb769c9c200dbfb1a78fec63430eaa79 data\portalcubed\loot_tables\entities\storage_cube.json
+b3f1f2fbb9c918c62d4e5f6930670c5920b2c690 data\portalcubed\loot_tables\entities\radio.json
+57a5e0bf2373e2548dab8077543b9e95e8dd2ad4 data\portalcubed\loot_tables\entities\intelligence_core.json
+19cd9ae3c2937208bfa9390163854ab38472f3ef data\portalcubed\loot_tables\entities\curiosity_core.json
+df05785c45716c8c5e5ce5f3466f0cfabd94076c data\portalcubed\loot_tables\entities\core_frame.json
+d4762018abff4512768063591fcf4c671ed72911 data\portalcubed\loot_tables\entities\companion_cube.json
+05125e0bb26b7431648dd726813673f6aeb174ab data\portalcubed\loot_tables\entities\energy_pellet.json
+3def4866fc047758973a2fed3167b59e5e847d20 data\portalcubed\loot_tables\entities\computer.json
+8bf3757e35e8778cc4939cfa7cd07ea470de86d7 data\portalcubed\loot_tables\entities\chair.json
+540b3dca3c773a9a73b065daac0a49f61d8c3142 data\portalcubed\loot_tables\entities\fact_core.json
+78f8faf928fd5249f9c3a1c62769d40ae6ddf669 data\portalcubed\loot_tables\entities\hoopy.json
+4029f6e0a7b46fcb4d25b368bc35379bc6efa36a data\portalcubed\loot_tables\entities\schrodinger_cube.json
+f34b72ab48c4137c06c5808efd74ac57b1d16641 data\portalcubed\loot_tables\entities\morality_core.json
+40d721cea2d04fde3163f010b62edf39821f5538 data\portalcubed\loot_tables\entities\adventure_core.json
+d933164c6894e055c25653b6571096682b4864ac data\portalcubed\loot_tables\entities\lil_pineapple.json
+00a9a37c5ac20598fa218d93792ed75fb53edc33 data\portalcubed\loot_tables\entities\anger_core.json
+2033d3dc9a856d5382e84ae4c17785c6e8fdfbde data\portalcubed\loot_tables\entities\redirection_cube.json
+ce78046a3d102b0d8813dfa698c0533cec58eb02 data\portalcubed\loot_tables\entities\turret.json
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/adventure_core.json b/src/generated/resources/data/portalcubed/loot_tables/entities/adventure_core.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:adventure_core"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/anger_core.json b/src/generated/resources/data/portalcubed/loot_tables/entities/anger_core.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:anger_core"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/beans.json b/src/generated/resources/data/portalcubed/loot_tables/entities/beans.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:beans"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/chair.json b/src/generated/resources/data/portalcubed/loot_tables/entities/chair.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:chair"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/companion_cube.json b/src/generated/resources/data/portalcubed/loot_tables/entities/companion_cube.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:companion_cube"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/computer.json b/src/generated/resources/data/portalcubed/loot_tables/entities/computer.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:computer"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/core_frame.json b/src/generated/resources/data/portalcubed/loot_tables/entities/core_frame.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:core_frame"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/curiosity_core.json b/src/generated/resources/data/portalcubed/loot_tables/entities/curiosity_core.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:curiosity_core"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/energy_pellet.json b/src/generated/resources/data/portalcubed/loot_tables/entities/energy_pellet.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:energy_pellet"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/fact_core.json b/src/generated/resources/data/portalcubed/loot_tables/entities/fact_core.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:fact_core"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/hoopy.json b/src/generated/resources/data/portalcubed/loot_tables/entities/hoopy.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:hoopy"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/intelligence_core.json b/src/generated/resources/data/portalcubed/loot_tables/entities/intelligence_core.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:intelligence_core"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/jug.json b/src/generated/resources/data/portalcubed/loot_tables/entities/jug.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:jug"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/portalcubed/loot_tables/entities/lil_pineapple.json b/src/generated/resources/data/portalcubed/loot_tables/entities/lil_pineapple.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "this"
+            }
+          ],
+          "name": "portalcubed:lil_pineapple"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}