Item model stuff, misc changes

- Added emissives for the High Energy Pellet and Super High Energy Pellet item models - Added emissives to many of the portal gun models - The glass tube has been added to some Portal Gun models that previously did not have them, following the translucency fix a few commits ago. - Added emissives for the Fizzler Emitter item models - Added emissives to prop item models for the props that have emissives on their entity model (Portal 2 Cubes, Radios, Cores) - Added emissives to block item models for blocks that use emissives (Pedestal Button, Floor Buttons, Excursion Funnel, Laser Catcher) - Fix the enchanting glint z fighting with itself on some item models - Fix the faith plate target blocking portal placement - Rename the current Beta Portal Gun skin internally to 2006 Beta Portal Gun, due to there being multiple known beta portal gun designs - Added subtitles for when the crowbar (and in the future, turrets) hit different surface types - Updated the license listed in the readme since that was changed a while ago
Fusion-Flux · Oct 10, 2023 · 10703a2 · 10703a2
1 parent b86f7e1
commit 10703a2
Show file tree

Hide file tree

Showing 77 changed files with 1,209 additions and 590 deletions.
diff --git a/README.md b/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>
diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/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"
     }
   ]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/emissives.json b/src/main/resources/assets/portalcubed/emissives.json
@@ -1,10 +1,9 @@
 {
-  "item/energy_pellet": "item/energy_pellet",
-  "item/super_pellet": "item/super_pellet",
-  "item/missing_pellet": "item/missing_pellet",
 
   "block/faith_plate_target": "block/faith_plate_target",
+  "item/faith_plate_target": "block/faith_plate_target",
 
+  "item/excursion_funnel_emitter": "block/excursion_funnel_emitter_e",
   "block/excursion_funnel_emitter_forward_off_quadrant_1": "block/excursion_funnel_emitter_e",
   "block/excursion_funnel_emitter_forward_off_quadrant_2": "block/excursion_funnel_emitter_e",
   "block/excursion_funnel_emitter_forward_off_quadrant_3": "block/excursion_funnel_emitter_e",
@@ -61,6 +60,7 @@
   "block/laser_emitter_active": "block/laser_emitter_e",
   "block/laser_catcher_active": "block/laser_emitter_e",
   "block/laser_catcher": "block/laser_emitter_e",
+  "item/laser_catcher": "block/laser_emitter_e",
 
 
   "block/portal_2_fizzler_top": "block/portal_2_fizzler_top",
@@ -156,13 +156,15 @@
   "block/octopus_door_top_right": "block/octopus_door_e",
   "block/octopus_door_top_right_open": "block/octopus_door_e",
 
-
+  "item/floor_button": "block/floor_button_e",
   "block/floor_button": "block/floor_button_e",
   "block/floor_button_active": "block/floor_button_e",
 
+  "item/old_ap_floor_button": "block/old_ap_floor_button_e",
   "block/old_ap_floor_button": "block/old_ap_floor_button_e",
   "block/old_ap_floor_button_active": "block/old_ap_floor_button_e",
 
+  "item/pedestal_button": "block/pedestal_button_e",
   "block/pedestal_button": "block/pedestal_button_e",
   "block/pedestal_button_active": "block/pedestal_button_e",
   "block/offset_pedestal_button": "block/pedestal_button_e",
@@ -172,5 +174,44 @@
 
   "block/rocket_turret_active": "block/rocket_turret_active_e",
   "block/rocket_turret_inactive": "block/rocket_turret_inactive_e",
-  "block/rocket_turret_lock_on": "block/rocket_turret_lock_on_e"
+  "block/rocket_turret_lock_on": "block/rocket_turret_lock_on_e",
+
+  "item/energy_pellet": "item/energy_pellet",
+  "item/super_pellet": "item/super_pellet",
+  "item/missing_pellet": "item/missing_pellet",
+
+  "item/portal_gun": "item/portal_gun_dyeable",
+  "item/portal_gun_primary": "item/portal_gun_dyeable",
+  "item/portal_gun_secondary": "item/portal_gun_dyeable",
+  "item/portal_gun_atlas": "item/portal_gun_dyeable",
+  "item/portal_gun_p_body": "item/portal_gun_dyeable",
+  "item/portal_gun_reloaded": "item/portal_gun_dyeable",
+  "item/potatos_portal_gun": "item/portal_gun_dyeable",
+  "item/2006_beta_portal_gun": "item/portal_gun_dyeable",
+  "item/mel_portal_gun": "item/portal_gun_dyeable",
+  "item/legacy_portal_gun": "item/portal_gun_dyeable",
+  "item/legacy_portal_gun_atlas": "item/portal_gun_dyeable",
+  "item/legacy_portal_gun_p_body": "item/portal_gun_dyeable",
+  "item/legacy_portal_gun_reloaded": "item/portal_gun_dyeable",
+
+  "item/fizzler_emitter": "item/portal_2_fizzler_icon",
+  "item/portal_1_fizzler_emitter": "item/portal_1_fizzler_icon",
+  "item/laser_fizzler_emitter": "item/portal_2_laser_field_icon",
+  "item/death_fizzler_emitter": "item/portal_2_death_fizzler_icon",
+  "item/old_aperture_fizzler_emitter": "item/old_aperture_fizzler_icon",
+  "item/old_aperture_death_fizzler_emitter": "item/old_aperture_death_fizzler_icon",
+  "item/matter_inquisition_field_emitter": "item/portal_2_matter_inquisition_field_icon",
+  "item/physics_repulsion_field_emitter": "item/portal_2_physics_repulsion_field_icon",
+
+  "item/storage_cube": "entity/storage_cube_e",
+  "item/companion_cube": "entity/companion_cube_e",
+  "item/radio": "entity/radio_e",
+  "item/morality_core": "entity/portal_1_cores_e",
+  "item/curiosity_core": "entity/portal_1_cores_e",
+  "item/intelligence_core": "entity/portal_1_cores_e",
+  "item/anger_core": "entity/portal_1_cores_e",
+  "item/space_core": "entity/portal_2_cores_e",
+  "item/adventure_core": "entity/portal_2_cores_e",
+  "item/fact_core": "entity/portal_2_cores_e"
+
 }
diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -40,10 +40,12 @@
   "subtitles.portalcubed.pellet.spawn": "Energy pellet launches",
 
   "subtitles.portalcubed.crowbar_swoosh": "Crowbar swooshes",
+  "subtitles.portalcubed.impact.concrete": "Concrete crumbles",
+  "subtitles.portalcubed.impact.metal": "Metal clanks",
+  "subtitles.portalcubed.impact.glass": "Glass cracks",
 
   "subtitles.portalcubed.faith_plate": "Faith plate activates",
 
-
   "advancement.portalcubed.root.title": "Portal Cubed",
   "advancement.portalcubed.root.description": "Welcome to Aperture Science! You're here because we want the best, and you are it.",
 
@@ -82,7 +84,7 @@
   "advancement.portalcubed.pellet_bounce.description": "Bounce a High Energy Pellet at least 35 times before it expires",
 
   "advancement.portalcubed.laser.title": "It Burns, Ah!",
-  "advancement.portalcubed.laser.description": "Touch a Thermal Discouragement Beam and become thermally discouraged",
+  "advancement.portalcubed.laser.description": "Touch a Thermal Discouragement Beam and become thermally discouraged from doing it again",
 
   "advancement.portalcubed.goo.title": "The Floor is Failure",
   "advancement.portalcubed.goo.description": "Submerse yourself in a pool of Toxic Goo and receive an unsatisfactory mark to your record",
@@ -442,7 +444,7 @@
 
   "portalcubed.midnightconfig.title": "Portal Cubed Config",
   "portalcubed.midnightconfig.maxBridgeLength": "Maximum Emitter Block Range",
-  "portalcubed.midnightconfig.enableRoundPortals": "Enable Round Portals",
+  "portalcubed.midnightconfig.enableRoundPortals": "Use Round Portal Texture",
   "portalcubed.midnightconfig.enableAccurateMovement": "Long Fall Boots Enable Source-Accurate Movement",
   "portalcubed.midnightconfig.fizzlerDamage": "Death Fizzler Damage",
   "portalcubed.midnightconfig.rocketDamage": "Rocket Turret Damage",
@@ -463,7 +465,7 @@
   "death.attack.fizzle": "%s was fizzled",
   "death.attack.fizzle.player": "%1$s was pushed into a fizzler by %2$s",
   "death.attack.vaporization": "%s was vaporized by a High Energy Pellet",
-  "death.attack.vaporization.player": "%1$s was vaporized by a High Energy Pellet because of %2$s",
+  "death.attack.vaporization.player": "%1$s was vaporized by a High Energy Pellet trying to escape %2$s",
   "death.attack.laser": "%s was thermally discouraged",
   "death.attack.laser.player": "%1$s was thermally discouraged trying to escape %2$s",
   "death.attack.cube": "%s was hit on the head by a falling Weighted Cube",

diff --git a/src/main/resources/assets/portalcubed/models/block/laser_catcher.json b/src/main/resources/assets/portalcubed/models/block/laser_catcher.json
@@ -21,7 +21,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [-0.01, 15.99, -0.01],
 			"to": [16.01, 17.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
@@ -34,7 +34,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [15.9, 16.75, 0.1],
 			"to": [0.075, 16.75, 15.9],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
@@ -143,5 +143,8 @@
 			"rotation": [-90, 0, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
+	},
+	"portalcubed:render_types": {
+		"translucent": ["transparent"]
 	}
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json b/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json
@@ -22,7 +22,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [-0.01, 15.99, -0.01],
 			"to": [16.01, 17.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16.04289, 22.95711, 0]},
@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [15.9, 16.75, 0.1],
 			"to": [0.075, 16.75, 15.9],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
@@ -143,5 +143,8 @@
 			"translation": [0, 0, -0.5],
 			"scale": [0.5, 0.5, 0.5]
 		}
+	},
+	"portalcubed:render_types": {
+		"translucent": ["transparent"]
 	}
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/laser_emitter.json b/src/main/resources/assets/portalcubed/models/block/laser_emitter.json
@@ -8,7 +8,7 @@
 	},
 	"elements": [
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [-0.01, 15.99, -0.01],
 			"to": [16.01, 17.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]},
@@ -21,7 +21,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [7.5, 18, 7.5],
 			"to": [8.5, 21, 8.5],
 			"rotation": {"angle": -45, "axis": "y", "origin": [8, 19.5, 8]},
@@ -34,7 +34,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [15.9, 16.75, 0.1],
 			"to": [0.075, 16.75, 15.9],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
@@ -184,5 +184,8 @@
 			"rotation": [-90, 0, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
+	},
+	"portalcubed:render_types": {
+		"translucent": ["transparent"]
 	}
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json b/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json
@@ -8,7 +8,7 @@
 	},
 	"elements": [
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [-0.01, 15.99, -0.01],
 			"to": [16.01, 17.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]},
@@ -21,7 +21,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [7.5, 18, 7.5],
 			"to": [8.5, 21, 8.5],
 			"rotation": {"angle": -45, "axis": "y", "origin": [8, 19.5, 8]},
@@ -34,7 +34,7 @@
 			}
 		},
 		{
-			"name": "translucent",
+			"name": "transparent",
 			"from": [15.9, 16.75, 0.1],
 			"to": [0.075, 16.75, 15.9],
 			"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
@@ -183,5 +183,8 @@
 			"translation": [0, 0, -0.5],
 			"scale": [0.5, 0.5, 0.5]
 		}
+	},
+	"portalcubed:render_types": {
+		"translucent": ["transparent"]
 	}
-}
+}