Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

README.md

@@ -39,17 +39,19 @@ Portal Cubed is a Minecraft mod for Quilt that adds mechanics from Valve's Porta
 
 
 ## License
-This project is licensed under the [MIT License](LICENSE)
+This project is licensed under the [Mozilla Public License version 2.0](LICENSE)
 
 ## Discord Server
 Join my Discord server to talk about ClusterFlux mods, or if you need help with said mods!
+
 <a href="https://discord.gg/YyrsVRNBA8" target="_blank">
   <img alt="discord-plural" height="56" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/social/discord-plural_vector.svg">
 </a>
 
 
 ## Support me!
 You can directly support me on Ko-Fi!
+
 <a href="https://ko-fi.com/fusionflux/" target="_blank">
   <img alt="kofi-singular" height="56" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/donate/kofi-singular_vector.svg">
 </a>

src/main/java/com/fusionflux/portalcubed/client/render/models/emissive/EmissiveData.java

@@ -4,10 +4,19 @@
 
 import com.google.common.collect.Multimap;
 
+import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
 
 public record EmissiveData(Multimap<ResourceLocation, ResourceLocation> map) {
 	public Collection<ResourceLocation> getEmissiveTexturesForModel(ResourceLocation id) {
+		if (id.toString().contains("energy_pellet"))
+			System.out.println(id);
+		if (id instanceof ModelResourceLocation modelId && modelId.getVariant().equals("inventory")) {
+			ResourceLocation sourceFormat = modelId.withPrefix("item/"); // also removes variant
+			if (id.toString().contains("energy_pellet"))
+				System.out.println(sourceFormat);
+			return map.get(sourceFormat);
+		}
 		return map.get(id);
 	}
 }

src/main/java/com/fusionflux/portalcubed/client/render/models/emissive/EmissiveLoader.java

@@ -29,7 +29,7 @@ public CompletableFuture<EmissiveData> load(ResourceManager manager, Executor ex
 			try {
 				Multimap<ResourceLocation, ResourceLocation> modelToTextures = HashMultimap.create();
 				GsonHelper.parse(resource.openAsReader()).asMap().forEach((model, element) -> {
-					ResourceLocation modelId = getModelId(model);
+					ResourceLocation modelId = getId(model);
 					List<ResourceLocation> textures = getTextures(element);
 					modelToTextures.putAll(modelId, textures);
 				});
@@ -56,13 +56,4 @@ private static ResourceLocation getId(String path) {
 			return PortalCubed.id(path);
 		}
 	}
-
-	private static ResourceLocation getModelId(String model) {
-		ResourceLocation id = getId(model);
-		if (id.getPath().startsWith("item/")) {
-			String path = id.getPath().substring(5);
-			return new ModelResourceLocation(id.getNamespace(), path, "inventory");
-		}
-		return id;
-	}
 }

src/main/resources/assets/minecraft/atlases/blocks.json

@@ -56,21 +56,41 @@
       "type": "single",
       "resource": "portalcubed:entity/radio"
     },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/radio_e"
+    },
     {
       "type": "single",
       "resource": "portalcubed:entity/companion_cube"
     },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/companion_cube_e"
+    },
     {
       "type": "single",
       "resource": "portalcubed:entity/storage_cube"
     },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/storage_cube_e"
+    },
     {
       "type": "single",
       "resource": "portalcubed:entity/portal_1_cores"
     },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_1_cores_e"
+    },
     {
       "type": "single",
       "resource": "portalcubed:entity/portal_2_cores"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_2_cores_e"
     }
   ]
-}
+}

src/main/resources/assets/portalcubed/blockstates/1x1_double_crossbar.json

@@ -1,12 +1,9 @@
 {
   "variants": {
-    "":[ { "model": "portalcubed:block/1x1_double_crossbar" }
-
-
+    "": [
+      {
+        "model": "portalcubed:block/1x1_double_crossbar"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/1x1_single_crossbar.json

@@ -1,12 +1,9 @@
 {
   "variants": {
-    "":[ { "model": "portalcubed:block/1x1_single_crossbar" }
-
-
+    "": [
+      {
+        "model": "portalcubed:block/1x1_single_crossbar"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/aged_padded_gray_half_panel.json

@@ -1,18 +1,24 @@
 {
   "variants": {
-    "":[
-      { "model": "portalcubed:block/aged_padded_gray_half_panel" },
-      { "model": "portalcubed:block/aged_padded_gray_half_panel2" },
-      { "model": "portalcubed:block/aged_padded_gray_half_panel3" },
-      { "model": "portalcubed:block/aged_padded_gray_half_panel4" },
-      { "model": "portalcubed:block/aged_padded_gray_half_panel5" },
-      { "model": "portalcubed:block/aged_padded_gray_half_panel6" }
-
-
+    "": [
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel2"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel3"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel4"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel5"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_half_panel6"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/aged_padded_gray_panel.json

@@ -1,16 +1,24 @@
 {
   "variants": {
-    "":[
-      { "model": "portalcubed:block/aged_padded_gray_panel" },
-      {"model": "portalcubed:block/aged_padded_gray_panel2"},
-      {"model": "portalcubed:block/aged_padded_gray_panel3"},
-      {"model": "portalcubed:block/aged_padded_gray_panel4"},
-      {"model": "portalcubed:block/aged_padded_gray_panel5"},
-      {"model": "portalcubed:block/aged_padded_gray_panel6"}
+    "": [
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel2"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel3"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel4"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel5"
+      },
+      {
+        "model": "portalcubed:block/aged_padded_gray_panel6"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/aged_smooth_gray_half_panel.json

@@ -1,18 +1,24 @@
 {
   "variants": {
-    "":[
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel" },
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel2" },
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel3" },
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel4" },
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel5" },
-      { "model": "portalcubed:block/aged_smooth_gray_half_panel6" }
-
-
+    "": [
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel2"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel3"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel4"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel5"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_half_panel6"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/aged_smooth_gray_panel.json

@@ -1,17 +1,27 @@
 {
   "variants": {
-    "":[
-      { "model": "portalcubed:block/aged_smooth_gray_panel" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel2" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel3" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel3" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel4" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel5" },
-      { "model": "portalcubed:block/aged_smooth_gray_panel6" }
+    "": [
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel2"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel3"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel3"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel4"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel5"
+      },
+      {
+        "model": "portalcubed:block/aged_smooth_gray_panel6"
+      }
     ]
-
-
-
-
   }
-}
+}

src/main/resources/assets/portalcubed/blockstates/aged_white_checkered_panel.json

@@ -1,12 +1,9 @@
 {
   "variants": {
-    "":[ { "model": "portalcubed:block/aged_white_checkered_panel" }
-
-
+    "": [
+      {
+        "model": "portalcubed:block/aged_white_checkered_panel"
+      }
     ]
-
-
-
-
   }
-}
+}