misc fixes, changes, and minor additions

- make more portal gun variants support dyeing - new damage type - banner patterns - fixed uv precision on door models - new advancement
Fusion-Flux · Jan 14, 2025 · 9d5a134 · 9d5a134
1 parent f1ab36c
commit 9d5a134
Show file tree

Hide file tree

Showing 96 changed files with 871 additions and 486 deletions.
diff --git a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java
@@ -17,6 +17,7 @@
 import io.github.fusionflux.portalcubed.content.prop.PropDispenseBehavior;
 import io.github.fusionflux.portalcubed.content.prop.PropItem;
 import io.github.fusionflux.portalcubed.content.prop.PropType;
+import io.github.fusionflux.portalcubed.data.tags.PortalCubedBannerPatternTags;
 import io.github.fusionflux.portalcubed.framework.item.BucketDispenseBehaviour;
 import io.github.fusionflux.portalcubed.framework.registration.item.ItemBuilder;
 import net.fabricmc.fabric.api.loot.v3.LootTableEvents;
@@ -30,6 +31,7 @@
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.food.Foods;
 import net.minecraft.world.item.ArmorItem;
+import net.minecraft.world.item.BannerPatternItem;
 import net.minecraft.world.item.BucketItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
@@ -54,6 +56,10 @@ public class PortalCubedItems {
 	public static final Item RAW_MAGNESIUM = REGISTRAR.items.create("raw_magnesium", Item::new)
 			.build();
 
+	public static final BannerPatternItem APERTURE_BANNER_PATTERN = REGISTRAR.items.create("aperture_banner_pattern", s -> new BannerPatternItem(PortalCubedBannerPatternTags.APERTURE, s))
+			.properties(s -> s.stacksTo(1))
+			.build();
+
 	public static final CrowbarItem CROWBAR = REGISTRAR.items.create("crowbar", CrowbarItem::new)
 			.properties(s -> s.stacksTo(1))
 			.build();

diff --git a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java
@@ -244,6 +244,7 @@ public class PortalCubedTabs {
 			output.accept(PortalCubedItems.LEMONADE);
 			output.accept(PortalCubedItems.LEMON_BOAT);
 			output.accept(PortalCubedItems.LEMON_CHEST_BOAT);
+			output.accept(PortalCubedItems.APERTURE_BANNER_PATTERN);
 			output.accept(PortalCubedItems.GOO_BUCKET);
 			output.accept(PortalCubedItems.ADVANCED_KNEE_REPLACEMENTS);
 			output.accept(PortalCubedItems.LONG_FALL_BOOTS);
@@ -433,6 +434,7 @@ public static void init() {
 			entries.addAfter(Items.RAW_IRON, PortalCubedItems.RAW_MAGNESIUM);
 			entries.addAfter(Items.IRON_NUGGET, PortalCubedItems.MAGNESIUM_NUGGET);
 			entries.addAfter(Items.IRON_INGOT, PortalCubedItems.MAGNESIUM_INGOT);
+			entries.addAfter(Items.GUSTER_BANNER_PATTERN, PortalCubedItems.APERTURE_BANNER_PATTERN);
 		});
 
 		ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FOOD_AND_DRINKS).register(entries -> {

diff --git a/src/main/java/io/github/fusionflux/portalcubed/data/tags/PortalCubedBannerPatternTags.java b/src/main/java/io/github/fusionflux/portalcubed/data/tags/PortalCubedBannerPatternTags.java
@@ -0,0 +1,14 @@
+package io.github.fusionflux.portalcubed.data.tags;
+
+import io.github.fusionflux.portalcubed.PortalCubed;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.block.entity.BannerPattern;
+
+public class PortalCubedBannerPatternTags {
+	public static final TagKey<BannerPattern> APERTURE = create("pattern_item/aperture");
+
+	private static TagKey<BannerPattern> create(String name) {
+		return TagKey.create(Registries.BANNER_PATTERN, PortalCubed.id(name));
+	}
+}
diff --git a/src/main/resources/assets/portalcubed/items/aperture_banner_pattern.json b/src/main/resources/assets/portalcubed/items/aperture_banner_pattern.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "portalcubed:item/aperture_banner_pattern"
+  }
+}
diff --git a/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json b/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json
@@ -9,7 +9,7 @@
       },
       {
         "type": "minecraft:dye",
-        "default": -1
+        "default": -11169857
       },
       {
         "type": "portalcubed:portal_gun",

diff --git a/src/main/resources/assets/portalcubed/items/peashooter.json b/src/main/resources/assets/portalcubed/items/peashooter.json
@@ -9,7 +9,7 @@
       },
       {
         "type": "minecraft:dye",
-        "default": -1
+        "default": -4658378
       },
       {
         "type": "portalcubed:portal_gun",

diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -382,6 +382,8 @@
 
   "advancement.portalcubed.portal_gun.title": "Thinking with Portals",
   "advancement.portalcubed.portal_gun.description": "Obtain a Portal Gun",
+  "advancement.portalcubed.dyed_portal_gun.title": "Pretty Painted Portal Producer",
+  "advancement.portalcubed.dyed_portal_gun.description": "Dye the shell of a Portal Gun",
   "advancement.portalcubed.portal_gun_fox.title": "You Shouldn't be Eating That",
   "advancement.portalcubed.portal_gun_fox.description": "Give a Portal Gun to a Fox",
   "advancement.portalcubed.construction_cannon.title": "Trust me, I'm an Engineer",
@@ -392,14 +394,18 @@
   "advancement.portalcubed.lemonade.title": "Burn Life's House Down!",
   "advancement.portalcubed.lemonade.description": "Create and use a combustible lemon",
 
-  "advancement.portalcubed.sign_here.title": "Sign Here",
-  "advancement.portalcubed.sign_here.description": "Place a Signage block",
-
+  "advancement.portalcubed.configure_test_element.title": "Give it a good whack",
+  "advancement.portalcubed.configure_test_element.description": "Use a Hammer to configure a test element",
+  "advancement.portalcubed.stalemate_associate.title": "Certified Stalemate Associate",
+  "advancement.portalcubed.stalemate_associate.description": "Configure a Pedestal Button",
   "advancement.portalcubed.hammer_time.title": "Stop - Hammer Time!",
-  "advancement.portalcubed.hammer_time.description": "Use a Hammer to configure a test element",
+  "advancement.portalcubed.hammer_time.description": "Change the timer of a test element",
   "advancement.portalcubed.crossover_episode.title": "Crossover Episode",
   "advancement.portalcubed.crossover_episode.description": "Obtain a Crowbar",
 
+  "advancement.portalcubed.sign_here.title": "Sign Here",
+  "advancement.portalcubed.sign_here.description": "Place a Signage block",
+
   "advancement.portalcubed.radio.title": "Tunes to Test to",
   "advancement.portalcubed.radio.description": "Obtain a Radio",
   "advancement.portalcubed.cubes.title": "Cubes to Keep You Company",
@@ -465,6 +471,42 @@
   "item.portalcubed.crowbar": "Crowbar",
   "item.portalcubed.construction_cannon": "Construction Cannon",
 
+  "item.portalcubed.aperture_banner_pattern": "Aperture Banner Pattern",
+  "block.portalcubed.banner.aperture.white": "White Aperture",
+  "block.portalcubed.banner.aperture.light_gray": "Light Gray Aperture",
+  "block.portalcubed.banner.aperture.gray": "Gray Aperture",
+  "block.portalcubed.banner.aperture.black": "Black Aperture",
+  "block.portalcubed.banner.aperture.brown": "Brown Aperture",
+  "block.portalcubed.banner.aperture.red": "Red Aperture",
+  "block.portalcubed.banner.aperture.orange": "Orange Aperture",
+  "block.portalcubed.banner.aperture.yellow": "Yellow Aperture",
+  "block.portalcubed.banner.aperture.lime": "Lime Aperture",
+  "block.portalcubed.banner.aperture.green": "Green Aperture",
+  "block.portalcubed.banner.aperture.blue": "Blue Aperture",
+  "block.portalcubed.banner.aperture.cyan": "Cyan Aperture",
+  "block.portalcubed.banner.aperture.light_blue": "Light Blue Aperture",
+  "block.portalcubed.banner.aperture.purple": "Purple Aperture",
+  "block.portalcubed.banner.aperture.magenta": "Magenta Aperture",
+  "block.portalcubed.banner.aperture.pink": "Pink Aperture",
+
+  "block.portalcubed.banner.oval.white": "White Oval",
+  "block.portalcubed.banner.oval.light_gray": "Light Gray Oval",
+  "block.portalcubed.banner.oval.gray": "Gray Oval",
+  "block.portalcubed.banner.oval.black": "Black Oval",
+  "block.portalcubed.banner.oval.brown": "Brown Oval",
+  "block.portalcubed.banner.oval.red": "Red Oval",
+  "block.portalcubed.banner.oval.orange": "Orange Oval",
+  "block.portalcubed.banner.oval.yellow": "Yellow Oval",
+  "block.portalcubed.banner.oval.lime": "Lime Oval",
+  "block.portalcubed.banner.oval.green": "Green Oval",
+  "block.portalcubed.banner.oval.blue": "Blue Oval",
+  "block.portalcubed.banner.oval.cyan": "Cyan Oval",
+  "block.portalcubed.banner.oval.light_blue": "Light Blue Oval",
+  "block.portalcubed.banner.oval.purple": "Purple Oval",
+  "block.portalcubed.banner.oval.magenta": "Magenta Oval",
+  "block.portalcubed.banner.oval.pink": "Pink Oval",
+
+
   "item.portalcubed.storage_cube": "Weighted Storage Cube",
   "item.portalcubed.storage_cube.2": "Dirty Weighted Storage Cube",
   "item.portalcubed.portal_1_storage_cube": "Portal 1 Weighted Storage Cube",
@@ -995,6 +1037,8 @@
   "death.attack.landing_damage": "%1$s was hit on the head by a falling %2$s",
   "death.attack.landing_damage.player":  "%1$s was hit on the head by a falling %2$s trying to escape %3$s",
   "death.attack.landing_damage.item":  "%1$s was hit on the head by a falling %2$s trying to escape %3$s wielding %4$s",
+  "death.attack.submerged_the_operational_end_of_the_device": "%1$s submerged the operational end of the device",
+  "death.attack.submerged_the_operational_end_of_the_device.player":  "%1$s submerged the operational end of the device trying to escape %2$s",
   "death.attack.lemonade": "%s combusted",
   "death.attack.lemonade.player":  "%1$s combusted due to %2$s's lemonade",
 

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json
@@ -2,7 +2,7 @@
 	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
 		"0": "portalcubed:signage/aged_small_signage_blank",
-		"particle": "portalcubed:signage/aged_small_signage_blank",
+		"particle": "portalcubed:signage/aged_large_signage_blank",
 		"signage_bottom_left": "#portalcubed:dynamic"
 	},
 	"elements": [

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json
@@ -2,7 +2,7 @@
 	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
 		"0": "portalcubed:signage/aged_small_signage_blank",
-		"particle": "portalcubed:signage/aged_small_signage_blank",
+		"particle": "portalcubed:signage/aged_large_signage_blank",
 		"signage_bottom_right": "#portalcubed:dynamic"
 	},
 	"elements": [

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json
@@ -2,7 +2,7 @@
 	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
 		"0": "portalcubed:signage/aged_small_signage_blank",
-		"particle": "portalcubed:signage/aged_small_signage_blank",
+		"particle": "portalcubed:signage/aged_large_signage_blank",
 		"signage_top_left": "#portalcubed:dynamic"
 	},
 	"elements": [

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json
@@ -2,7 +2,7 @@
 	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
 		"0": "portalcubed:signage/aged_small_signage_blank",
-		"particle": "portalcubed:signage/aged_small_signage_blank",
+		"particle": "portalcubed:signage/aged_large_signage_blank",
 		"signage_top_right": "#portalcubed:dynamic"
 	},
 	"elements": [

diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json
@@ -22,8 +22,8 @@
 			"to": [6.01, 16.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
-				"east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"},
-				"west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}
+				"east": {"uv": [2, 4, 4, 8], "texture": "#0"},
+				"west": {"uv": [0, 4, 2, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -37,4 +37,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json
@@ -11,11 +11,11 @@
 			"from": [0.99, -0.01, -12.01],
 			"to": [5.01, 16.01, 4.01],
 			"faces": {
-				"north": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0"},
-				"east": {"uv": [10.0025, 4, 8, 8.005], "texture": "#0"},
-				"south": {"uv": [6.0025, 0, 5.5, 4.005], "texture": "#0"},
-				"west": {"uv": [12, 3.995, 14.0025, 8], "texture": "#0"},
-				"down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"}
+				"north": {"uv": [7, 4, 7.5, 8], "texture": "#0"},
+				"east": {"uv": [10, 4, 8, 8], "texture": "#0"},
+				"south": {"uv": [6, 0, 5.5, 4], "texture": "#0"},
+				"west": {"uv": [12, 4, 14, 8], "texture": "#0"},
+				"down": {"uv": [7, 0, 7.5, 4], "texture": "#0"}
 			}
 		},
 		{
@@ -31,8 +31,8 @@
 			"to": [6.01, 16.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
-				"east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"},
-				"west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}
+				"east": {"uv": [2, 4, 4, 8], "texture": "#0"},
+				"west": {"uv": [0, 4, 2, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -46,4 +46,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/...ain/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json b/...ain/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json
@@ -23,8 +23,8 @@
 			"to": [6.01, 16.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
-				"east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"},
-				"west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}
+				"east": {"uv": [2, 4, 4, 8], "texture": "#0"},
+				"west": {"uv": [0, 4, 2, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -41,9 +41,9 @@
 			"from": [1, 0, 0],
 			"to": [5, 16, 16],
 			"faces": {
-				"south": {"uv": [0.992, 0.008, 0.008, 3.992], "texture": "#2", "cullface": "north"},
-				"west": {"uv": [4.008, 4.008, 7.992, 7.992], "texture": "#2"}
+				"south": {"uv": [1, 0, 0, 4], "texture": "#2", "cullface": "north"},
+				"west": {"uv": [4, 4, 8, 8], "texture": "#2"}
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json
@@ -30,8 +30,8 @@
 			"from": [-0.01, -0.01, -0.01],
 			"to": [6.01, 16.01, 16.01],
 			"faces": {
-				"east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"},
-				"west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}
+				"east": {"uv": [0, 4, 2, 8], "texture": "#0"},
+				"west": {"uv": [2, 4, 4, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -44,4 +44,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json
@@ -8,14 +8,14 @@
 	},
 	"elements": [
 		{
-			"from": [0.99, -0.01, 11.99],
-			"to": [5.01, 16.01, 28.01],
+			"from": [1, 0, 12],
+			"to": [5, 16, 28],
 			"faces": {
-				"north": {"uv": [5.5, 3.995, 6.0025, 8], "texture": "#0", "cullface": "north"},
-				"east": {"uv": [8, 4, 10.0025, 8.005], "texture": "#0"},
-				"south": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0", "cullface": "south"},
-				"west": {"uv": [13.9975, 3.995, 16, 8], "texture": "#0"},
-				"down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0", "cullface": "down"}
+				"north": {"uv": [5.5, 4, 6, 8], "texture": "#0", "cullface": "north"},
+				"east": {"uv": [8, 4, 10, 8], "texture": "#0"},
+				"south": {"uv": [7, 4, 7.5, 8], "texture": "#0", "cullface": "south"},
+				"west": {"uv": [14, 4, 16, 8], "texture": "#0"},
+				"down": {"uv": [7, 0, 7.5, 4], "texture": "#0", "cullface": "down"}
 			}
 		},
 		{
@@ -30,8 +30,8 @@
 			"from": [-0.01, -0.01, -0.01],
 			"to": [6.01, 16.01, 16.01],
 			"faces": {
-				"east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"},
-				"west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}
+				"east": {"uv": [0, 4, 2, 8], "texture": "#0"},
+				"west": {"uv": [2, 4, 4, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -44,4 +44,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/...in/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json b/...in/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json
@@ -30,8 +30,8 @@
 			"from": [-0.01, -0.01, -0.01],
 			"to": [6.01, 16.01, 16.01],
 			"faces": {
-				"east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"},
-				"west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}
+				"east": {"uv": [0, 4, 2, 8], "texture": "#0"},
+				"west": {"uv": [2, 4, 4, 8], "texture": "#0"}
 			}
 		},
 		{
@@ -44,4 +44,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json
@@ -22,8 +22,8 @@
 			"to": [6.01, 16.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
-				"east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"},
-				"west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}
+				"east": {"uv": [2, 0, 4, 4], "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 4], "texture": "#0"}
 			}
 		},
 		{
@@ -37,4 +37,4 @@
 			}
 		}
 	]
-}
+}