feature, bug: Added stored munition explosions for big cannon shells …

…and big cannon propellant, many fixes - Affected blocks are launched, including inert projectiles - Propellant blocks can explode from fire, while projectiles must be exploded - Munitions can be blocked from exploding and/or catching fire by waterlogging - Waterlogged propellant will become damp - Damp propellant can be dried either by waiting (random tick) or placing the projectile in the Nether, similar to sponges - Damp propellant cannot be dried in furnaces - Damp propellant is indicated by an item tooltip as well as blocks emitting water particles - Damp behavior can be configured per propellant and toggled globally - Reverted breaking change in Wired Fuze commit by making ProjectileBlock#getProjectile methods not abstract - Update to BigCannonPropellantPropertiesComponent to account for propellant explosion power - Added documentation to MountedBigCannonsContraption#fireShot because my code is just confusing - Fixed pick-cloning Big Cartridge power value - Fixed Quick-Firing Breech smoke on assembled cannons not persisting - Fixed Quick-Firing Breech side lever not actually ejecting the contents - Fixed Quick-Firing Breech accepting input from the sides - Changed Powder Charge texture
Cannoneers-of-Create · Dec 30, 2024 · 9df34cf · 9df34cf
1 parent abcebb0
commit 9df34cf
Show file tree

Hide file tree

Showing 75 changed files with 2,269 additions and 279 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,18 @@ and freedom tastes of reality..."* \
   - Only works with big cannon shells in base Create Big Cannons
   - On detonation, the detonation effect of the fuzed shell is spawned in world
   - Can be used for improvised explosives
+- Added ability for big cannon shell blocks and propellant blocks to explode
+  - Propellant can catch fire and explode, shells cannot
+  - Explosion power can be configured per munition block
+  - Behavior can be toggled in server config
+- Munitions can be blocked from exploding and/or catching fire by waterlogging
+- Waterlogging propellant will make it damp
+  - Damp propellant that isn't waterlogged is vulnerable to ignition and explosion
+  - Damp propellant can be dried either by waiting (random tick) or placing the projectile in the Nether, similar to sponges
+  - Damp propellant cannot be dried in furnaces
+  - Damp propellant is indicated by an item tooltip as well as blocks emitting water particles
+  - Damp behavior can be configured per projectile
+  - Damp behavior can be toggled in server config
 ### Changed
 - Cannon Mount can now be turned around both axes without the Yaw Controller
 - Cannon Mount now disassembles on rotation with wrench
@@ -33,12 +45,15 @@ and freedom tastes of reality..."* \
   - Cannon Mounts can also be flipped by using the wrench
 - Changed Cannon Mount item model to be more consistent with in-world appearance
 - Reduced default Proximity Fuze arming delay to 5 gameticks
-- [Addons, BREAKING] Added abstract method to get projectiles from in-world blocks
 ### Fixed
 - Fixed rendering of pitch shaft for down-facing cannons
 - Fixed display on some ponders
 - Fixed autocannon tracer lighting and non-tracer rendering
 - Fixed conductivity of certain cannon mount blocks
+- Fixed pick-cloning Big Cartridge power value
+- Fixed Quick-Firing Breech smoke on assembled cannons not persisting
+- Fixed Quick-Firing Breech side lever not actually ejecting the contents
+- Fixed Quick-Firing Breech accepting input from the sides
 
 ## [5.7.2] - 2024-12-18
 

diff --git a/Translators-Changes.md b/Translators-Changes.md
@@ -10,6 +10,7 @@ Note: Changes to en_us.json before Create Big Cannons 0.5.3.b => 0.5.4 will not
 Additions: \
 &plus; `"block.createbigcannons.cannon_mount_extension": "Cannon Mount Extension"` \
 &plus; `"block.createbigcannons.fixed_cannon_mount": "Fixed Cannon Mount"` \
+&plus; `"block.createbigcannons.propellant.tooltip.damp": "Damp"` \
 &plus; `"createbigcannons.fixed_cannon_mount.angle_pitch": "Pitch Adjustment"` \
 &plus; `"createbigcannons.fixed_cannon_mount.angle_yaw": "Yaw Adjustment"` \
 &plus; `"createbigcannons.ponder.cannon_mount/upside_down_cannon_mounts.header": "Placing Cannon Mounts upside down"` \
@@ -26,6 +27,14 @@ Additions: \
 &plus; `"createbigcannons.ponder.cannon_mount/using_fixed_cannon_mounts.text_5": "Fire cannon"` \
 &plus; `"createbigcannons.ponder.cannon_mount/using_fixed_cannon_mounts.text_6": "The Fixed Cannon Mount cannot be extended."` \
 &plus; `"createbigcannons.ponder.cannon_mount/using_fixed_cannon_mounts.text_7": "Use a wrench to rotate the Fixed Cannon Mount."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.header": "Protecting Munitions with Waterlogging, and its Side Effects"` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_1": "Propellant blocks, as well as projectiles, are vulnerable to exploding from fire and other explosions."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_2": "Munition blocks can be protected from fire and explosions by waterlogging them."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_3": "However, waterlogging causes propellant blocks to become damp."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_4": "Damp propellant is weaker and also fails to ignite if it is placed as the first propellant block in a big cannon."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_5": "To fix this, damp propellant must be left to dry, and cannot be dried in a furnace like wet sponges."` \
+&plus; `"createbigcannons.ponder.munitions/wet_ammo_storage.text_6": "However, propellant placed in hot places like the Nether will instantly dry, similar to wet sponges."` \
+&plus; `"entity.createbigcannons.primed_propellant": "Primed Propellant"` \
 &plus; `"item.createbigcannons.wired_fuze": "Wired Fuze"` \
 &plus; `"item.createbigcannons.wired_fuze.tooltip": "WIRED FUZE"` \
 &plus; `"item.createbigcannons.wired_fuze.tooltip.behaviour1": "The fuze detonates when powered by redstone."` \

diff --git a/fabric/src/generated/resources/assets/createbigcannons/blockstates/ap_shell.json b/fabric/src/generated/resources/assets/createbigcannons/blockstates/ap_shell.json
@@ -1,27 +1,53 @@
 {
   "variants": {
-    "facing=down": {
+    "facing=down,waterlogged=false": {
       "model": "createbigcannons:block/ap_shell",
       "x": 180
     },
-    "facing=east": {
+    "facing=down,waterlogged=true": {
+      "model": "createbigcannons:block/ap_shell",
+      "x": 180
+    },
+    "facing=east,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shell",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,waterlogged=true": {
       "model": "createbigcannons:block/ap_shell",
       "x": 90,
       "y": 90
     },
-    "facing=north": {
+    "facing=north,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shell",
+      "x": 90
+    },
+    "facing=north,waterlogged=true": {
       "model": "createbigcannons:block/ap_shell",
       "x": 90
     },
-    "facing=south": {
+    "facing=south,waterlogged=false": {
       "model": "createbigcannons:block/ap_shell",
       "x": 90,
       "y": 180
     },
-    "facing=up": {
+    "facing=south,waterlogged=true": {
+      "model": "createbigcannons:block/ap_shell",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shell"
+    },
+    "facing=up,waterlogged=true": {
       "model": "createbigcannons:block/ap_shell"
     },
-    "facing=west": {
+    "facing=west,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shell",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,waterlogged=true": {
       "model": "createbigcannons:block/ap_shell",
       "x": 90,
       "y": 270

diff --git a/fabric/src/generated/resources/assets/createbigcannons/blockstates/ap_shot.json b/fabric/src/generated/resources/assets/createbigcannons/blockstates/ap_shot.json
@@ -1,27 +1,53 @@
 {
   "variants": {
-    "facing=down": {
+    "facing=down,waterlogged=false": {
       "model": "createbigcannons:block/ap_shot",
       "x": 180
     },
-    "facing=east": {
+    "facing=down,waterlogged=true": {
+      "model": "createbigcannons:block/ap_shot",
+      "x": 180
+    },
+    "facing=east,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shot",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,waterlogged=true": {
       "model": "createbigcannons:block/ap_shot",
       "x": 90,
       "y": 90
     },
-    "facing=north": {
+    "facing=north,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shot",
+      "x": 90
+    },
+    "facing=north,waterlogged=true": {
       "model": "createbigcannons:block/ap_shot",
       "x": 90
     },
-    "facing=south": {
+    "facing=south,waterlogged=false": {
       "model": "createbigcannons:block/ap_shot",
       "x": 90,
       "y": 180
     },
-    "facing=up": {
+    "facing=south,waterlogged=true": {
+      "model": "createbigcannons:block/ap_shot",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shot"
+    },
+    "facing=up,waterlogged=true": {
       "model": "createbigcannons:block/ap_shot"
     },
-    "facing=west": {
+    "facing=west,waterlogged=false": {
+      "model": "createbigcannons:block/ap_shot",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,waterlogged=true": {
       "model": "createbigcannons:block/ap_shot",
       "x": 90,
       "y": 270

diff --git a/fabric/src/generated/resources/assets/createbigcannons/blockstates/bag_of_grapeshot.json b/fabric/src/generated/resources/assets/createbigcannons/blockstates/bag_of_grapeshot.json
@@ -1,27 +1,53 @@
 {
   "variants": {
-    "facing=down": {
+    "facing=down,waterlogged=false": {
       "model": "createbigcannons:block/bag_of_grapeshot",
       "x": 180
     },
-    "facing=east": {
+    "facing=down,waterlogged=true": {
+      "model": "createbigcannons:block/bag_of_grapeshot",
+      "x": 180
+    },
+    "facing=east,waterlogged=false": {
+      "model": "createbigcannons:block/bag_of_grapeshot",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,waterlogged=true": {
       "model": "createbigcannons:block/bag_of_grapeshot",
       "x": 90,
       "y": 90
     },
-    "facing=north": {
+    "facing=north,waterlogged=false": {
+      "model": "createbigcannons:block/bag_of_grapeshot",
+      "x": 90
+    },
+    "facing=north,waterlogged=true": {
       "model": "createbigcannons:block/bag_of_grapeshot",
       "x": 90
     },
-    "facing=south": {
+    "facing=south,waterlogged=false": {
       "model": "createbigcannons:block/bag_of_grapeshot",
       "x": 90,
       "y": 180
     },
-    "facing=up": {
+    "facing=south,waterlogged=true": {
+      "model": "createbigcannons:block/bag_of_grapeshot",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,waterlogged=false": {
+      "model": "createbigcannons:block/bag_of_grapeshot"
+    },
+    "facing=up,waterlogged=true": {
       "model": "createbigcannons:block/bag_of_grapeshot"
     },
-    "facing=west": {
+    "facing=west,waterlogged=false": {
+      "model": "createbigcannons:block/bag_of_grapeshot",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,waterlogged=true": {
       "model": "createbigcannons:block/bag_of_grapeshot",
       "x": 90,
       "y": 270

diff --git a/fabric/src/generated/resources/assets/createbigcannons/blockstates/big_cartridge.json b/fabric/src/generated/resources/assets/createbigcannons/blockstates/big_cartridge.json
@@ -1,53 +1,105 @@
 {
   "variants": {
-    "facing=down,filled=false": {
+    "damp=false,facing=down,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty",
       "x": 180
     },
-    "facing=down,filled=true": {
+    "damp=false,facing=down,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled",
       "x": 180
     },
-    "facing=east,filled=false": {
+    "damp=false,facing=east,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty",
       "x": 90,
       "y": 90
     },
-    "facing=east,filled=true": {
+    "damp=false,facing=east,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled",
       "x": 90,
       "y": 90
     },
-    "facing=north,filled=false": {
+    "damp=false,facing=north,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty",
       "x": 90
     },
-    "facing=north,filled=true": {
+    "damp=false,facing=north,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled",
       "x": 90
     },
-    "facing=south,filled=false": {
+    "damp=false,facing=south,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty",
       "x": 90,
       "y": 180
     },
-    "facing=south,filled=true": {
+    "damp=false,facing=south,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled",
       "x": 90,
       "y": 180
     },
-    "facing=up,filled=false": {
+    "damp=false,facing=up,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty"
     },
-    "facing=up,filled=true": {
+    "damp=false,facing=up,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled"
     },
-    "facing=west,filled=false": {
+    "damp=false,facing=west,filled=false": {
       "model": "createbigcannons:block/big_cartridge_empty",
       "x": 90,
       "y": 270
     },
-    "facing=west,filled=true": {
+    "damp=false,facing=west,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled",
+      "x": 90,
+      "y": 270
+    },
+    "damp=true,facing=down,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty",
+      "x": 180
+    },
+    "damp=true,facing=down,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled",
+      "x": 180
+    },
+    "damp=true,facing=east,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty",
+      "x": 90,
+      "y": 90
+    },
+    "damp=true,facing=east,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled",
+      "x": 90,
+      "y": 90
+    },
+    "damp=true,facing=north,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty",
+      "x": 90
+    },
+    "damp=true,facing=north,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled",
+      "x": 90
+    },
+    "damp=true,facing=south,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty",
+      "x": 90,
+      "y": 180
+    },
+    "damp=true,facing=south,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled",
+      "x": 90,
+      "y": 180
+    },
+    "damp=true,facing=up,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty"
+    },
+    "damp=true,facing=up,filled=true": {
+      "model": "createbigcannons:block/big_cartridge_filled"
+    },
+    "damp=true,facing=west,filled=false": {
+      "model": "createbigcannons:block/big_cartridge_empty",
+      "x": 90,
+      "y": 270
+    },
+    "damp=true,facing=west,filled=true": {
       "model": "createbigcannons:block/big_cartridge_filled",
       "x": 90,
       "y": 270