5.8.1 fixes

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [5.8.1] - Unreleased
+
+*"I'm free – I'm FREE, \
+and I'm waiting for you to follow me..."* \
+– "I'm Free", The Who (1969)
+
+**Create Big Cannons 5.8.1. Comes with a few critical fixes and improvements for Create Big Cannons 5.8.0.**
+
+### Added
+- Added recipes for Fixed Cannon Mount and Wired Fuze (fixes issue #730)
+- Added Mechanical Arm interaction with Fixed Cannon Mount
+- Added contraption connectivity between Fixed Cannon Mount and cannon blocks
+
 ## [5.8.0] - 2024-12-30
 
 *"I'm free – I'm FREE, \

Translators-Changes.md

@@ -6,6 +6,10 @@ Note: Changes to en_us.json before Create Big Cannons 0.5.3.b => 0.5.4 will not
 
 ---
 
+## 5.8.0 → 5.8.1
+Additions: \
++ `"tag.createbigcannons.ingot_copper": "Copper Ingots"`
+
 ## 5.7.2 → 5.8.0
 Additions: \
 + `"block.createbigcannons.cannon_mount_extension": "Cannon Mount Extension"` \

fabric/src/generated/resources/assets/createbigcannons/lang/en_ud.json

@@ -704,6 +704,7 @@
   "tag.createbigcannons.ingot_brass": "sʇobuI ssɐɹᗺ",
   "tag.createbigcannons.ingot_bronze": "sʇobuI ǝzuoɹᗺ",
   "tag.createbigcannons.ingot_cast_iron": "sʇobuI uoɹI ʇsɐƆ",
+  "tag.createbigcannons.ingot_copper": "sʇobuI ɹǝddoƆ",
   "tag.createbigcannons.ingot_iron": "sʇobuI uoɹI",
   "tag.createbigcannons.ingot_nethersteel": "sʇobuI ןǝǝʇsɹǝɥʇǝN",
   "tag.createbigcannons.ingot_steel": "sʇobuI ןǝǝʇS",

fabric/src/generated/resources/assets/createbigcannons/lang/en_us.json

@@ -704,6 +704,7 @@
   "tag.createbigcannons.ingot_brass": "Brass Ingots",
   "tag.createbigcannons.ingot_bronze": "Bronze Ingots",
   "tag.createbigcannons.ingot_cast_iron": "Cast Iron Ingots",
+  "tag.createbigcannons.ingot_copper": "Copper Ingots",
   "tag.createbigcannons.ingot_iron": "Iron Ingots",
   "tag.createbigcannons.ingot_nethersteel": "Nethersteel Ingots",
   "tag.createbigcannons.ingot_steel": "Steel Ingots",

fabric/src/generated/resources/data/createbigcannons/advancements/recipes/misc/fixed_cannon_mount.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_gunpowder": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "createbigcannons:gunpowder"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "createbigcannons:fixed_cannon_mount"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_gunpowder",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "createbigcannons:fixed_cannon_mount"
+    ]
+  },
+  "sends_telemetry_event": false
+}

fabric/src/generated/resources/data/createbigcannons/advancements/recipes/misc/wired_fuze.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_redstone": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "createbigcannons:dusts_redstone"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "createbigcannons:wired_fuze"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_redstone",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "createbigcannons:wired_fuze"
+    ]
+  },
+  "sends_telemetry_event": false
+}

fabric/src/generated/resources/data/createbigcannons/recipes/fixed_cannon_mount.json

@@ -0,0 +1,23 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "C": {
+      "item": "create:andesite_casing"
+    },
+    "G": {
+      "tag": "createbigcannons:gunpowder"
+    },
+    "I": {
+      "tag": "createbigcannons:sheet_iron"
+    }
+  },
+  "pattern": [
+    " I ",
+    "GCG"
+  ],
+  "result": {
+    "item": "createbigcannons:fixed_cannon_mount"
+  },
+  "show_notification": true
+}

fabric/src/generated/resources/data/createbigcannons/recipes/wired_fuze.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "I": {
+      "tag": "createbigcannons:ingot_copper"
+    },
+    "W": {
+      "tag": "createbigcannons:dusts_redstone"
+    }
+  },
+  "pattern": [
+    "WIW"
+  ],
+  "result": {
+    "count": 4,
+    "item": "createbigcannons:wired_fuze"
+  },
+  "show_notification": true
+}

fabric/src/generated/resources/data/createbigcannons/tags/items/ingot_copper.json

@@ -0,0 +1,17 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#forge:ingots/copper",
+      "required": false
+    },
+    {
+      "id": "#c:ingots/copper",
+      "required": false
+    },
+    {
+      "id": "#c:copper_ingots",
+      "required": false
+    }
+  ]
+}

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/mixin/CannonMountPointMixin.java

@@ -9,10 +9,12 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import rbasamoyai.createbigcannons.cannon_control.cannon_mount.CannonMountBlockEntity;
 import rbasamoyai.createbigcannons.cannon_control.contraption.AbstractMountedCannonContraption;
 import rbasamoyai.createbigcannons.cannon_control.contraption.PitchOrientedContraptionEntity;
+import rbasamoyai.createbigcannons.cannon_control.fixed_cannon_mount.FixedCannonMountBlockEntity;
 import rbasamoyai.createbigcannons.cannons.big_cannons.breeches.quickfiring_breech.CannonMountPoint;
 
 @Mixin(CannonMountPoint.class)
@@ -27,9 +29,17 @@ public ItemStack insert(ItemStack stack, TransactionContext ctx) {
 		CannonMountPoint self = (CannonMountPoint) (Object) this;
 		boolean simulate = !stack.getOrCreateTag().contains("DontSimulate");
 		if (!simulate) stack.getTag().remove("DontSimulate");
-		if (!(this.getLevel().getBlockEntity(this.pos) instanceof CannonMountBlockEntity mount)) return stack;
-		PitchOrientedContraptionEntity poce = mount.getContraption();
-		if (poce == null || !(poce.getContraption() instanceof AbstractMountedCannonContraption cannon)) return stack;
+		BlockEntity be = this.getLevel().getBlockEntity(this.pos);
+		PitchOrientedContraptionEntity poce;
+		if (be instanceof CannonMountBlockEntity mount) {
+			poce = mount.getContraption();
+		} else if (be instanceof FixedCannonMountBlockEntity mount) {
+			poce = mount.getContraption();
+		} else {
+			return stack;
+		}
+		if (poce == null || !(poce.getContraption() instanceof AbstractMountedCannonContraption cannon))
+			return stack;
 		return self.getInsertedResultAndDoSomething(stack, simulate, cannon, poce);
 	}
 

forge/src/generated/resources/assets/createbigcannons/lang/en_ud.json

@@ -704,6 +704,7 @@
   "tag.createbigcannons.ingot_brass": "sʇobuI ssɐɹᗺ",
   "tag.createbigcannons.ingot_bronze": "sʇobuI ǝzuoɹᗺ",
   "tag.createbigcannons.ingot_cast_iron": "sʇobuI uoɹI ʇsɐƆ",
+  "tag.createbigcannons.ingot_copper": "sʇobuI ɹǝddoƆ",
   "tag.createbigcannons.ingot_iron": "sʇobuI uoɹI",
   "tag.createbigcannons.ingot_nethersteel": "sʇobuI ןǝǝʇsɹǝɥʇǝN",
   "tag.createbigcannons.ingot_steel": "sʇobuI ןǝǝʇS",

forge/src/generated/resources/assets/createbigcannons/lang/en_us.json

@@ -704,6 +704,7 @@
   "tag.createbigcannons.ingot_brass": "Brass Ingots",
   "tag.createbigcannons.ingot_bronze": "Bronze Ingots",
   "tag.createbigcannons.ingot_cast_iron": "Cast Iron Ingots",
+  "tag.createbigcannons.ingot_copper": "Copper Ingots",
   "tag.createbigcannons.ingot_iron": "Iron Ingots",
   "tag.createbigcannons.ingot_nethersteel": "Nethersteel Ingots",
   "tag.createbigcannons.ingot_steel": "Steel Ingots",

forge/src/generated/resources/data/createbigcannons/advancements/recipes/misc/fixed_cannon_mount.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_gunpowder": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "createbigcannons:gunpowder"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "createbigcannons:fixed_cannon_mount"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_gunpowder",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "createbigcannons:fixed_cannon_mount"
+    ]
+  },
+  "sends_telemetry_event": false
+}

forge/src/generated/resources/data/createbigcannons/advancements/recipes/misc/wired_fuze.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_redstone": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "createbigcannons:dusts_redstone"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "createbigcannons:wired_fuze"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_redstone",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "createbigcannons:wired_fuze"
+    ]
+  },
+  "sends_telemetry_event": false
+}

forge/src/generated/resources/data/createbigcannons/recipes/fixed_cannon_mount.json

@@ -0,0 +1,23 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "C": {
+      "item": "create:andesite_casing"
+    },
+    "G": {
+      "tag": "createbigcannons:gunpowder"
+    },
+    "I": {
+      "tag": "createbigcannons:sheet_iron"
+    }
+  },
+  "pattern": [
+    " I ",
+    "GCG"
+  ],
+  "result": {
+    "item": "createbigcannons:fixed_cannon_mount"
+  },
+  "show_notification": true
+}

forge/src/generated/resources/data/createbigcannons/recipes/wired_fuze.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "I": {
+      "tag": "createbigcannons:ingot_copper"
+    },
+    "W": {
+      "tag": "createbigcannons:dusts_redstone"
+    }
+  },
+  "pattern": [
+    "WIW"
+  ],
+  "result": {
+    "count": 4,
+    "item": "createbigcannons:wired_fuze"
+  },
+  "show_notification": true
+}

forge/src/generated/resources/data/createbigcannons/tags/items/ingot_copper.json

@@ -0,0 +1,17 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#forge:ingots/copper",
+      "required": false
+    },
+    {
+      "id": "#c:ingots/copper",
+      "required": false
+    },
+    {
+      "id": "#c:copper_ingots",
+      "required": false
+    }
+  ]
+}