Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "anvilcraft:item/hardend_resin"
"model": "anvilcraft:item/hardened_resin"
}
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/anvilcraft/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@
"item.anvilcraft.gray_cement_bucket": "ʇǝʞɔnᗺ ʇuǝɯǝƆ ʎɐɹ⅁",
"item.anvilcraft.green_cement_bucket": "ʇǝʞɔnᗺ ʇuǝɯǝƆ uǝǝɹ⅁",
"item.anvilcraft.guide_book": "ʞooᗺ ǝpᴉn⅁ ʇɟɐɹƆꞁᴉʌuⱯ",
"item.anvilcraft.hardend_resin": "uᴉsǝᴚ puǝpɹɐH",
"item.anvilcraft.hardened_resin": "uᴉsǝᴚ pǝuǝpɹɐH",
"item.anvilcraft.heavy_halberd_core": "ǝɹoƆ pɹǝqꞁɐH ʎʌɐǝH",
"item.anvilcraft.heliostats.pos_set": "%s ǝʇɐᴉpɐɹɹᴉ ꞁꞁᴉM",
"item.anvilcraft.helium_bucket": "ʇǝʞɔnᗺ ɯnᴉꞁǝH",
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/anvilcraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@
"item.anvilcraft.gray_cement_bucket": "Gray Cement Bucket",
"item.anvilcraft.green_cement_bucket": "Green Cement Bucket",
"item.anvilcraft.guide_book": "AnvilCraft Guide Book",
"item.anvilcraft.hardend_resin": "Hardend Resin",
"item.anvilcraft.hardened_resin": "Hardened Resin",
"item.anvilcraft.heavy_halberd_core": "Heavy Halberd Core",
"item.anvilcraft.heliostats.pos_set": "Will irradiate %s",
"item.anvilcraft.helium_bucket": "Helium Bucket",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "anvilcraft:item/hardend_resin"
"layer0": "anvilcraft:item/hardened_resin"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -21,7 +21,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin"
"has_hardened_resin"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -21,7 +21,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin"
"has_hardened_resin"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:fast_cooking/hardend_resin"
"recipe": "anvilcraft:fast_cooking/hardened_resin"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -15,7 +15,7 @@
],
"rewards": {
"recipes": [
"anvilcraft:fast_cooking/hardend_resin"
"anvilcraft:fast_cooking/hardened_resin"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -32,7 +32,7 @@
[
"has_the_recipe",
"has_redstone_wire",
"has_hardend_resin"
"has_hardened_resin"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -21,7 +21,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin"
"has_hardened_resin"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -21,7 +21,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin"
"has_hardened_resin"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand Down Expand Up @@ -41,7 +41,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin",
"has_hardened_resin",
"has_iron_ingot",
"has_magnet_ingot"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_hardend_resin": {
"has_hardened_resin": {
"conditions": {
"items": [
{
"items": "anvilcraft:hardend_resin"
"items": "anvilcraft:hardened_resin"
}
]
},
Expand All @@ -41,7 +41,7 @@
"requirements": [
[
"has_the_recipe",
"has_hardend_resin",
"has_hardened_resin",
"has_hopper",
"has_circuit_board"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "redstone",
"key": {
"H": "anvilcraft:hardend_resin",
"H": "anvilcraft:hardened_resin",
"I": "minecraft:iron_ingot",
"R": "minecraft:redstone"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"key": {
"B": "anvilcraft:resin_block",
"I": "minecraft:iron_boots",
"R": "anvilcraft:hardend_resin"
"R": "anvilcraft:hardened_resin"
},
"pattern": [
"R R",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"R": "anvilcraft:hardend_resin",
"R": "anvilcraft:hardened_resin",
"W": "anvilcraft:redstone_wire"
},
"pattern": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"B": "anvilcraft:hardend_resin",
"B": "anvilcraft:hardened_resin",
"Q": "minecraft:quartz",
"T": "minecraft:redstone_torch"
},
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/data/anvilcraft/recipe/disk.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": "anvilcraft:hardend_resin",
"A": "anvilcraft:hardened_resin",
"B": "minecraft:iron_ingot",
"C": "anvilcraft:magnet_ingot"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"results": [
{
"id": "anvilcraft:hardend_resin"
"id": "anvilcraft:hardened_resin"
}
]
}
2 changes: 1 addition & 1 deletion src/generated/resources/data/anvilcraft/recipe/filter.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": "anvilcraft:hardend_resin",
"A": "anvilcraft:hardened_resin",
"B": "minecraft:hopper",
"C": "anvilcraft:circuit_board"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": "anvilcraft:hardend_resin",
"A": "anvilcraft:hardened_resin",
"B": "anvilcraft:pill"
},
"pattern": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"category": "misc",
"group": "anvilcraft:processor",
"key": {
"B": "anvilcraft:hardend_resin",
"B": "anvilcraft:hardened_resin",
"C": "#c:nuggets/copper",
"D": "#c:gems/quartz"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"B": "anvilcraft:hardend_resin",
"B": "anvilcraft:hardened_resin",
"R": "minecraft:redstone",
"T": "minecraft:redstone_torch"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static void init(RegistrumRecipeProvider provider) {
HolderGetter<Item> items = provider.getItems();
FastCookingRecipe.builder()
.requires(items, ModItemTags.RESIN)
.result(ModItems.HARDEND_RESIN)
.result(ModItems.HARDENED_RESIN)
.save(provider);

FastCookingRecipe.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ public static <T extends Block> void bigRedButton(DataGenContext<Block, T> ctx,
.pattern("RHR")
.pattern("III")
.define('R', Items.REDSTONE)
.define('H', ModItems.HARDEND_RESIN)
.define('H', ModItems.HARDENED_RESIN)
.define('I', Items.IRON_INGOT)
.unlockedBy(
AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(provider.getItems(), ModItems.HARDEND_RESIN)
AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(provider.getItems(), ModItems.HARDENED_RESIN)
)
.save(provider);
}
Expand Down
Loading
Loading