Skip to content

Commit 18ab9b7

Browse files
committed
feat: remove version check before 1.20, add stone -> deepslate to transform recipes
1 parent 271dbdd commit 18ab9b7

File tree

4 files changed

+37
-47
lines changed

4 files changed

+37
-47
lines changed

src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/items/machines/SmithingTemplateRandomizer.kt

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,26 @@ class SmithingTemplateRandomizer(
1919
) : RandomHopperMachine(itemGroup, itemStack, recipeType, recipe, energyPerTick) {
2020

2121
init {
22-
if (MinecraftVersionUtil.isAtLeast(20)) {
23-
val templates = arrayOf(
24-
Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE.toItem(),
25-
Material.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
26-
Material.VEX_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
27-
Material.WILD_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
28-
Material.COAST_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
29-
Material.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
30-
Material.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
31-
Material.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
32-
Material.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
33-
Material.HOST_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
34-
Material.WARD_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
35-
Material.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
36-
Material.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
37-
Material.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
38-
Material.RIB_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
39-
Material.EYE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
40-
Material.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem()
41-
)
42-
// TODO: 1.21 new templates
43-
addRecipe(IEItems.UNKNOWN_SMITHING_TEMPLATE.withAmount(8), templates)
44-
}
22+
val templates = arrayOf(
23+
Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE.toItem(),
24+
Material.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
25+
Material.VEX_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
26+
Material.WILD_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
27+
Material.COAST_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
28+
Material.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
29+
Material.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
30+
Material.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
31+
Material.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
32+
Material.HOST_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
33+
Material.WARD_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
34+
Material.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
35+
Material.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
36+
Material.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
37+
Material.RIB_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
38+
Material.EYE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem(),
39+
Material.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE.toItem()
40+
)
41+
// TODO: 1.21 new templates
42+
addRecipe(IEItems.UNKNOWN_SMITHING_TEMPLATE.withAmount(8), templates)
4543
}
4644
}

src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/items/machines/StoneworksFactory.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,9 @@ class StoneworksFactory(
187187
put(Material.COBBLESTONE, Material.ANDESITE)
188188
put(Material.ANDESITE, Material.DIORITE)
189189
put(Material.DIORITE, Material.GRANITE)
190-
191-
if (MinecraftVersionUtil.isAtLeast(20)) {
192-
put(Material.SAND, Material.SUSPICIOUS_SAND)
193-
put(Material.GRAVEL, Material.SUSPICIOUS_GRAVEL)
194-
}
190+
put(Material.STONE, Material.DEEPSLATE)
191+
put(Material.SAND, Material.SUSPICIOUS_SAND)
192+
put(Material.GRAVEL, Material.SUSPICIOUS_GRAVEL)
195193
}
196194
);
197195

src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/items/machines/TreeGrower.kt

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,21 @@ class TreeGrower(
8181
)
8282
)
8383

84-
if (MinecraftVersionUtil.isAtLeast(19)) {
85-
addRecipe(
86-
Material.MANGROVE_PROPAGULE.toItem(), arrayOf(
87-
Material.MANGROVE_LEAVES.toItem(8),
88-
Material.MANGROVE_LOG.toItem(6),
89-
Material.MANGROVE_ROOTS.toItem(4),
90-
Material.MUDDY_MANGROVE_ROOTS.toItem(2)
91-
)
84+
addRecipe(
85+
Material.MANGROVE_PROPAGULE.toItem(), arrayOf(
86+
Material.MANGROVE_LEAVES.toItem(8),
87+
Material.MANGROVE_LOG.toItem(6),
88+
Material.MANGROVE_ROOTS.toItem(4),
89+
Material.MUDDY_MANGROVE_ROOTS.toItem(2)
9290
)
93-
}
91+
)
9492

95-
if (MinecraftVersionUtil.isAtLeast(20)) {
96-
addRecipe(
97-
Material.CHERRY_SAPLING.toItem(), arrayOf(
98-
Material.CHERRY_LEAVES.toItem(8),
99-
Material.CHERRY_LOG.toItem(6),
100-
Material.STICK.toItem()
101-
)
93+
addRecipe(
94+
Material.CHERRY_SAPLING.toItem(), arrayOf(
95+
Material.CHERRY_LEAVES.toItem(8),
96+
Material.CHERRY_LOG.toItem(6),
97+
Material.STICK.toItem()
10298
)
103-
}
99+
)
104100
}
105101
}

src/main/resources/lang/en.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,8 +1166,6 @@ items:
11661166
- "&7Randomly get a smithing template"
11671167
- "&7from an &bUnknown Smithing Template."
11681168
- ""
1169-
- "&cOnly works on 1.20+."
1170-
- ""
11711169
ADVANCED_ANVIL:
11721170
name: "&cAdvanced Anvil"
11731171
lore:

0 commit comments

Comments
 (0)