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

Fusion-Flux · Jul 20, 2023 · 8e8a7eb · 8e8a7eb
2 parents 695c11d + 348ee7b
commit 8e8a7eb
Show file tree

Hide file tree

Showing 138 changed files with 1,558 additions and 723 deletions.
diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json
@@ -0,0 +1,76 @@
+{
+  "sources": [
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/beans"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/chair"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/computer"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/core_frame"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/default_turret"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/lil_pineapple"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/old_ap_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/mug_white"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_1_companion_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_1_storage_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/redirection_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/schrodinger_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/water_jug"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/radio"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/companion_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/storage_cube"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_1_cores"
+    },
+    {
+      "type": "single",
+      "resource": "portalcubed:entity/portal_2_cores"
+    }
+  ]
+}
diff --git a/src/main/resources/assets/portalcubed/blockstates/neurotoxin_emitter.json b/src/main/resources/assets/portalcubed/blockstates/neurotoxin_emitter.json
@@ -1,10 +1,52 @@
 {
   "variants": {
-    "powered=false": {
-      "model": "portalcubed:block/neurotoxin_emitter_off"
+    "facing=east,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "y": 270
     },
-    "powered=true": {
-      "model": "portalcubed:block/neurotoxin_emitter_on"
+    "facing=north,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "y": 180
+    },
+    "facing=south,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "y": 0
+    },
+    "facing=west,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "y": 90
+    },
+    "facing=up,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "x": 90
+    },
+    "facing=down,powered=true": {
+      "model": "portalcubed:block/neurotoxin_emitter_on",
+      "x": 270
+    },
+    "facing=east,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "y": 270
+    },
+    "facing=north,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "y": 180
+    },
+    "facing=south,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "y": 0
+    },
+    "facing=west,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "y": 90
+    },
+    "facing=up,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "x": 90
+    },
+    "facing=down,powered=false": {
+      "model": "portalcubed:block/neurotoxin_emitter_off",
+      "x": 270
     }
   }
 }
diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -5,6 +5,7 @@
 
   "subtitles.portalcubed.gel_bounce": "Something bounces on propulsion gel",
   "subtitles.portalcubed.gel_run": "Something slides on propulsion gel",
+
   "subtitles.portalcubed.portal_gun_secondary_fire": "Portal gun secondary fire",
   "subtitles.portalcubed.portal_gun_primary_fire": "Portal gun primary fire",
   "subtitles.portalcubed.portal_invalid_surface": "Portal gun failed",
@@ -21,15 +22,14 @@
   "subtitles.portalcubed.laser.node_deactivate": "Laser node deactivates",
   "subtitles.portalcubed.laser.node_sing": "Laser node sings",
 
-
   "subtitles.portalcubed.pedestal_button_press": "Switch activates",
   "subtitles.portalcubed.pedestal_button_release": "Switch deactivates",
   "subtitles.portalcubed.floor_button_press": "Button activates",
   "subtitles.portalcubed.floor_button_release": "Button deactivates",
 
   "subtitles.portalcubed.rocket.fire": "Rocket launches",
-  "subtitles.portalcubed.rocket.locked": "Rocket locked",
-  "subtitles.portalcubed.rocket.locking": "Rocket locking",
+  "subtitles.portalcubed.rocket.locked": "Rocket turret fires",
+  "subtitles.portalcubed.rocket.locking": "Rocket turret locks on",
 
   "subtitles.portalcubed.pellet.bounce": "Energy pellet bounces",
   "subtitles.portalcubed.pellet.explode": "Energy pellet explodes",
@@ -54,7 +54,7 @@
   "tooltip.portalcubed.schrodinger_cube.2": "Schrodinger Cubes linked by name",
   "tooltip.portalcubed.schrodinger_cube.3": "ignore other Schrodinger Cubes.",
 
-  "tooltip.portalcubed.radio.1": " Changes if the music toggles when picked up.",
+  "tooltip.portalcubed.radio.1": " Changes if the music toggles when picked up",
 
   "tooltip.portalcubed.velocity_helper.1": " Links Velocity Helpers",
   "tooltip.portalcubed.velocity_helper.2": " Opens Configuration Menu",
@@ -341,7 +341,6 @@
 
   "block.portalcubed.neurotoxin_emitter": "Neurotoxin Emitter",
   "block.portalcubed.excursion_funnel_emitter": "Excursion Funnel Emitter",
-  "block.portalcubed.excursion_funnel": "Excursion Funnel",
   "block.portalcubed.portal_1_door": "Portal 1 Door",
   "block.portalcubed.portal_2_door": "Portal 2 Door",
   "block.portalcubed.octopus_door": "Octopus Door",
@@ -447,13 +446,14 @@
   "entity.portalcubed.schrodinger_cube": "Schrödinger Cube",
   "entity.portalcubed.old_ap_cube": "Old Aperture Weighted Storage Cube",
 
-  "entity.portalcubed.decal": "Decal",
   "entity.portalcubed.energy_pellet": "High Energy Pellet",
 
   "entity.portalcubed.rocket": "Rocket",
 
   "entity.portalcubed.portal": "Portal",
 
+  "entity.portalcubed.excursion_funnel": "Excursion Funnel",
+
   "entity.portalcubed.turret": "Sentry Turret",
 
   "item.portalcubed.music_disc_still_alive": "Music Disc",
@@ -478,6 +478,8 @@
   "gamerule.category.portalcubed": "Portal Cubed",
   "gamerule.allowCrouchFlyGlitch": "Allow Crouch Fly Glitch",
   "gamerule.allowCrouchFlyGlitch.description": "Enables the Excursion Funnel Crouch Fly Glitch from Portal 2.",
+  "gamerule.disablePortalValidation": "Disable Portal Validation",
+  "gamerule.disablePortalValidation.description": "Disables placement checks when shooting portals, allowing them to be placed on any surface, including overhangs. May cause unexpected behavior - Issues caused by invalid portals will not be fixed.",
   "gamerule.portalAlignment": "Portal Alignment",
   "gamerule.portalAlignment.description": "Changes portal placement snapping, with the value being fraction of a block snapped to. For example, 16 is every pixel, 1 is full blocks, and 0 is off.",
   "gamerule.usePortalHud": "Use Portal HUD",

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_padded_gray_half_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_padded_gray_half_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/aged_padded_gray_half_panels_1",
-		"1": "portalcubed:block/aged_padded_gray_half_panels_1"
+		"1": "portalcubed:block/aged_padded_gray_half_panels_1",
+		"particle": "portalcubed:block/aged_padded_gray_half_panels_1"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/aged_padded_gray_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_padded_gray_panel_facade.json
@@ -9,7 +9,7 @@
 			"from": [0, 0, 0],
 			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},

diff --git a/src/main/resources/assets/portalcubed/models/block/aged_smooth_gray_half_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_smooth_gray_half_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/aged_smooth_gray_half_panels_1",
-		"1": "portalcubed:block/aged_smooth_gray_half_panels_1"
+		"1": "portalcubed:block/aged_smooth_gray_half_panels_1",
+		"particle": "portalcubed:block/aged_smooth_gray_half_panels_1"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/aged_smooth_gray_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_smooth_gray_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/aged_smooth_gray_panel_1",
-		"1": "portalcubed:block/aged_smooth_gray_panel_1"
+		"1": "portalcubed:block/aged_smooth_gray_panel_1",
+		"particle": "portalcubed:block/aged_smooth_gray_panel_1"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/aged_white_half_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_white_half_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/aged_white_half_panels_1",
-		"1": "portalcubed:block/aged_white_half_panels_1"
+		"1": "portalcubed:block/aged_white_half_panels_1",
+		"particle": "portalcubed:block/aged_white_half_panels_1"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/aged_white_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/aged_white_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/aged_white_panel_1",
-		"1": "portalcubed:block/aged_white_panel_1"
+		"1": "portalcubed:block/aged_white_panel_1",
+		"particle": "portalcubed:block/aged_white_panel_1"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/dirty_borderless_panel_facade.json b/src/main/resources/assets/portalcubed/models/block/dirty_borderless_panel_facade.json
@@ -1,13 +1,15 @@
 {
+	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/dirty_borderless_panel",
-		"1": "portalcubed:block/dirty_borderless_panel"
+		"1": "portalcubed:block/dirty_borderless_panel",
+		"particle": "portalcubed:block/dirty_borderless_panel"
 	},
 	"elements": [
-		{   "from": [ 0, 0, 0 ],
-			"to": [ 16, 16, 0.01 ],
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 0.01],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"},
 				"east": {"uv": [15.99, 0, 16, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 0.01, 16], "texture": "#1"},
@@ -16,4 +18,4 @@
 			}
 		}
 	]
-}
+}