Skip to content

Fabric compatibility updates [ Really bad patch job ] #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsedov wants to merge 2 commits into
base: 1.20-main
Choose a base branch
from
Open

Fabric compatibility updates [ Really bad patch job ] #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e254635
- Comment out vault mounting in ShippingContainers to prevent NPE dur…
vsedov Jan 24, 2026
044102c
fix andesite casing issue and other issues related to build.
vsedov Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private static void registerCageLamps (String metal, Function<String, Item> gett
"block/palettes/cage_lamp/"
+ metal.toLowerCase(Locale.ROOT).replaceAll(" ", "_") + "_lamp"
);
Supplier<Item> material = (metal == "Andesite" ? AllItems.ANDESITE_ALLOY : null);
Supplier<Item> material = (metal.equals("Andesite") ? AllItems.ANDESITE_ALLOY : null);

YELLOW_CAGE_LAMPS.put(metal, CageLamps.build(
CreateDecoMod.REGISTRATE, metal, DyeColor.YELLOW, cage, YELLOW_ON, YELLOW_OFF
Expand Down
4 changes: 3 additions & 1 deletion common/src/main/java/com/github/talrey/createdeco/api/ShippingContainers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public static BlockBuilder<ShippingContainerBlock,?> build (
.lang(visName + " Shipping Container")

.blockstate((ctx, prov) -> BlockStateGenerator.shippingContainer(CreateDecoMod.REGISTRATE, color, ctx, prov))
.transform(MountedItemStorageType.mountedItemStorage(AllMountedStorageTypes.VAULT))
// NOTE: Vault mounting disabled for datagen - causes NPE due to Create initialization order
// TODO: Re-enable after datagen completes or find way to defer this registration
// .transform(MountedItemStorageType.mountedItemStorage(AllMountedStorageTypes.VAULT))
Comment on lines +58 to +60
Copy link

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vault mounting functionality has been disabled with a TODO note about re-enabling it after datagen. This leaves the shipping containers in a degraded state without their intended mounting functionality. Before merging, either: 1) Implement the deferred registration pattern mentioned in the TODO to fix the NPE issue, 2) Document this as a known limitation in the PR description and create a tracking issue, or 3) Consider alternative solutions like conditional registration based on whether datagen is running. Leaving this commented out indefinitely could result in missing functionality that users expect.

Copilot uses AI. Check for mistakes.
.onRegister(connectedTextures(ShippingContainerCTBehavior::new));
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/github/talrey/createdeco/api/Windows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static BlockEntry<WindowBlock> windowBlock(String name,
.define('#', Ingredient.of(CreateDecoTags.ingot(name.replace("_window", ""))))
.define('X', CreateDecoTags.GLASS)
.unlockedBy("has_item", InventoryChangeTrigger.TriggerInstance.hasItems(
(ItemLike) ItemPredicate.Builder.item().of(CreateDecoTags.ingot(name.replace("_window", "")))
ItemPredicate.Builder.item().of(CreateDecoTags.ingot(name.replace("_window", ""))).build()
))
.save(p::accept))
.initialProperties(() -> Blocks.GLASS)
Expand Down
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/andesite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:andesite_alloy_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:brass_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:copper_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/industrial_iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:industrial_iron_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:iron_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/netherite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/blocks/storage_blocks/zinc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/andesite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:andesite_alloy"
Copy link

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The andesite_alloy item is being tagged as an "ingot" in the common tag system. However, andesite_alloy is not an ingot - it's an alloy item from Create with different properties. Ingots typically follow standard metal conversion patterns (9 ingots = 1 block, 1 ingot = 9 nuggets). This semantic inconsistency could cause issues with mods that expect ingots to follow these standard patterns. Consider creating a separate tag category for alloys or using a more appropriate tag like "c:alloys/andesite" if such a tag exists in the Fabric common tags convention.

Suggested change
"create:andesite_alloy"

Copilot uses AI. Check for mistakes.
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:brass_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:copper_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:iron_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/netherite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/ingots/zinc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_ingot"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/andesite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:andesite_alloy"
]
Comment on lines +3 to +5
Copy link

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The andesite_alloy item is being tagged as a "nugget" in the common tag system. However, andesite_alloy is not a nugget - it's an alloy item from Create. Nuggets are typically 1/9th of an ingot. This semantic inconsistency could cause issues with mods that expect nuggets to follow the standard 9 nuggets = 1 ingot conversion pattern. Consider creating a separate tag category for alloys or removing this tag if andesite doesn't have a nugget form.

Suggested change
"values": [
"create:andesite_alloy"
]
"values": []

Copilot uses AI. Check for mistakes.
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:brass_nugget"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:copper_nugget"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_nugget"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:iron_nugget"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/nuggets/zinc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_nugget"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/plates/brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:brass_sheet"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/plates/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:copper_sheet"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/plates/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:golden_sheet"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/plates/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:iron_sheet"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/andesite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:andesite_alloy_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:brass_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:copper_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/industrial_iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:industrial_iron_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:iron_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/netherite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_block"
]
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/c/tags/items/storage_blocks/zinc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_block"
]
}
15 changes: 15 additions & 0 deletions common/src/main/resources/data/createdeco/recipes/cutting/andesite_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:andesite_sheet_metal"
}
],
"results": [
{
"item": "createdeco:andesite_sheet",
"count": 4
}
],
"processingTime": 50
}
15 changes: 15 additions & 0 deletions common/src/main/resources/data/createdeco/recipes/cutting/brass_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:brass_sheet_metal"
}
],
"results": [
{
"item": "create:brass_sheet",
"count": 4
}
],
"processingTime": 50
}
15 changes: 15 additions & 0 deletions common/src/main/resources/data/createdeco/recipes/cutting/copper_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:copper_sheet_metal"
}
],
"results": [
{
"item": "create:copper_sheet",
"count": 4
}
],
"processingTime": 50
}
15 changes: 15 additions & 0 deletions ...c/main/resources/data/createdeco/recipes/cutting/industrial_iron_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:industrial_iron_sheet_metal"
}
],
"results": [
{
"item": "createdeco:industrial_iron_sheet",
"count": 4
}
],
"processingTime": 50
}
15 changes: 15 additions & 0 deletions common/src/main/resources/data/createdeco/recipes/cutting/iron_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:iron_sheet_metal"
}
],
"results": [
{
"item": "create:iron_sheet",
"count": 4
}
],
"processingTime": 50
}
15 changes: 15 additions & 0 deletions common/src/main/resources/data/createdeco/recipes/cutting/zinc_sheet_metal_cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "createdeco:zinc_sheet_metal"
}
],
"results": [
{
"item": "createdeco:zinc_sheet",
"count": 4
}
],
"processingTime": 50
}
Loading