Skip to content

Commit ddfa7a4

Browse files
ErrorCraftErrorCraft
committed
Port to 25w07a
1 parent edaf4ab commit ddfa7a4

91 files changed

Lines changed: 1627 additions & 191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=25w06a
7-
yarn_mappings=25w06a+build.7
6+
minecraft_version=25w07a
7+
yarn_mappings=25w07a+build.12
88
loader_version=0.18.4
99

1010
# Mod Properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G
1313
archives_base_name = itematic
1414

1515
# Dependencies
16-
fabric_version=0.116.0+1.21.5
16+
fabric_version=0.117.3+1.21.5

‎src/client/java/net/errorcraft/itematic/mixin/client/render/item/HeldItemRendererExtender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private int getUseTimeLeftForCrossbowUseNegatedUsedTicks(AbstractClientPlayerEnt
136136
slice = @Slice(
137137
from = @At(
138138
value = "INVOKE",
139-
target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
139+
target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ModelTransformationMode;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
140140
ordinal = 0
141141
)
142142
)

‎src/datagen/java/net/errorcraft/itematic/data/server/tag/TradeTagProvider.java‎

Lines changed: 77 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
7070
.add(Trades.BUY_BLACK_DYE)
7171
.add(Trades.BUY_LIGHT_BLUE_DYE)
7272
.add(Trades.BUY_LIME_DYE)
73-
.add(Trades.SELL_WHITE_WOOL)
74-
.add(Trades.SELL_ORANGE_WOOL)
75-
.add(Trades.SELL_MAGENTA_WOOL)
76-
.add(Trades.SELL_LIGHT_BLUE_WOOL)
77-
.add(Trades.SELL_YELLOW_WOOL)
78-
.add(Trades.SELL_LIME_WOOL)
79-
.add(Trades.SELL_PINK_WOOL)
80-
.add(Trades.SELL_GRAY_WOOL)
81-
.add(Trades.SELL_LIGHT_GRAY_WOOL)
82-
.add(Trades.SELL_CYAN_WOOL)
83-
.add(Trades.SELL_PURPLE_WOOL)
84-
.add(Trades.SELL_BLUE_WOOL)
85-
.add(Trades.SELL_BROWN_WOOL)
86-
.add(Trades.SELL_GREEN_WOOL)
87-
.add(Trades.SELL_RED_WOOL)
88-
.add(Trades.SELL_BLACK_WOOL)
73+
.add(Trades.SELL_WHITE_WOOL_SHEPHERD)
74+
.add(Trades.SELL_ORANGE_WOOL_SHEPHERD)
75+
.add(Trades.SELL_MAGENTA_WOOL_SHEPHERD)
76+
.add(Trades.SELL_LIGHT_BLUE_WOOL_SHEPHERD)
77+
.add(Trades.SELL_YELLOW_WOOL_SHEPHERD)
78+
.add(Trades.SELL_LIME_WOOL_SHEPHERD)
79+
.add(Trades.SELL_PINK_WOOL_SHEPHERD)
80+
.add(Trades.SELL_GRAY_WOOL_SHEPHERD)
81+
.add(Trades.SELL_LIGHT_GRAY_WOOL_SHEPHERD)
82+
.add(Trades.SELL_CYAN_WOOL_SHEPHERD)
83+
.add(Trades.SELL_PURPLE_WOOL_SHEPHERD)
84+
.add(Trades.SELL_BLUE_WOOL_SHEPHERD)
85+
.add(Trades.SELL_BROWN_WOOL_SHEPHERD)
86+
.add(Trades.SELL_GREEN_WOOL_SHEPHERD)
87+
.add(Trades.SELL_RED_WOOL_SHEPHERD)
88+
.add(Trades.SELL_BLACK_WOOL_SHEPHERD)
8989
.add(Trades.SELL_WHITE_CARPET)
9090
.add(Trades.SELL_ORANGE_CARPET)
9191
.add(Trades.SELL_MAGENTA_CARPET)
@@ -167,7 +167,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
167167
.add(Trades.SELL_ENCHANTED_CROSSBOW)
168168
.add(Trades.SELL_TIPPED_ARROW);
169169
this.getOrCreateTagBuilder(TradeTags.LIBRARIAN_NOVICE)
170-
.add(Trades.BUY_PAPER)
170+
.add(Trades.BUY_PAPER_LIBRARIAN)
171171
.add(Trades.SELL_ENCHANTED_BOOK_NOVICE)
172172
.add(Trades.SELL_BOOKSHELF);
173173
this.getOrCreateTagBuilder(TradeTags.LIBRARIAN_APPRENTICE)
@@ -186,34 +186,41 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
186186
this.getOrCreateTagBuilder(TradeTags.LIBRARIAN_MASTER)
187187
.add(Trades.SELL_NAME_TAG);
188188
this.getOrCreateTagBuilder(TradeTags.CARTOGRAPHER_NOVICE)
189-
.add(Trades.BUY_PAPER)
189+
.add(Trades.BUY_PAPER_CARTOGRAPHER)
190190
.add(Trades.SELL_MAP);
191191
this.getOrCreateTagBuilder(TradeTags.CARTOGRAPHER_APPRENTICE)
192192
.add(Trades.BUY_GLASS_PANE)
193-
.add(Trades.SELL_MONUMENT_MAP);
193+
.add(Trades.SELL_TAIGA_VILLAGE_MAP)
194+
.add(Trades.SELL_SWAMP_HUT_MAP)
195+
.add(Trades.SELL_SNOWY_VILLAGE_MAP)
196+
.add(Trades.SELL_SAVANNA_VILLAGE_MAP)
197+
.add(Trades.SELL_PLAINS_VILLAGE_MAP)
198+
.add(Trades.SELL_JUNGLE_TEMPLE_MAP)
199+
.add(Trades.SELL_DESERT_VILLAGE_MAP);
194200
this.getOrCreateTagBuilder(TradeTags.CARTOGRAPHER_JOURNEYMAN)
195201
.add(Trades.BUY_COMPASS)
196-
.add(Trades.SELL_MANSION_MAP);
202+
.add(Trades.SELL_MONUMENT_MAP)
203+
.add(Trades.SELL_TRIAL_CHAMBER_MAP);
197204
this.getOrCreateTagBuilder(TradeTags.CARTOGRAPHER_EXPERT)
198205
.add(Trades.SELL_ITEM_FRAME)
199-
.add(Trades.SELL_WHITE_BANNER)
200-
.add(Trades.SELL_BLUE_BANNER)
201-
.add(Trades.SELL_LIGHT_BLUE_BANNER)
202-
.add(Trades.SELL_RED_BANNER)
203-
.add(Trades.SELL_PINK_BANNER)
204-
.add(Trades.SELL_GREEN_BANNER)
205-
.add(Trades.SELL_LIME_BANNER)
206-
.add(Trades.SELL_GRAY_BANNER)
207-
.add(Trades.SELL_BLACK_BANNER)
208-
.add(Trades.SELL_PURPLE_BANNER)
209-
.add(Trades.SELL_MAGENTA_BANNER)
210-
.add(Trades.SELL_CYAN_BANNER)
211-
.add(Trades.SELL_BROWN_BANNER)
212-
.add(Trades.SELL_YELLOW_BANNER)
213-
.add(Trades.SELL_ORANGE_BANNER)
214-
.add(Trades.SELL_LIGHT_GRAY_BANNER);
206+
.add(Trades.SELL_BLUE_BANNER_CARTOGRAPHER)
207+
.add(Trades.SELL_WHITE_BANNER_CARTOGRAPHER)
208+
.add(Trades.SELL_RED_BANNER_CARTOGRAPHER)
209+
.add(Trades.SELL_GREEN_BANNER_CARTOGRAPHER)
210+
.add(Trades.SELL_LIME_BANNER_CARTOGRAPHER)
211+
.add(Trades.SELL_PURPLE_BANNER_CARTOGRAPHER)
212+
.add(Trades.SELL_CYAN_BANNER_CARTOGRAPHER)
213+
.add(Trades.SELL_YELLOW_BANNER_CARTOGRAPHER)
214+
.add(Trades.SELL_ORANGE_BANNER_CARTOGRAPHER)
215+
.add(Trades.SELL_BROWN_BANNER_CARTOGRAPHER)
216+
.add(Trades.SELL_MAGENTA_BANNER_CARTOGRAPHER)
217+
.add(Trades.SELL_LIGHT_BLUE_BANNER_CARTOGRAPHER)
218+
.add(Trades.SELL_PINK_BANNER_CARTOGRAPHER)
219+
.add(Trades.SELL_GRAY_BANNER_CARTOGRAPHER)
220+
.add(Trades.SELL_BLACK_BANNER_CARTOGRAPHER);
215221
this.getOrCreateTagBuilder(TradeTags.CARTOGRAPHER_MASTER)
216-
.add(Trades.SELL_GLOBE_BANNER_PATTERN);
222+
.add(Trades.SELL_GLOBE_BANNER_PATTERN)
223+
.add(Trades.SELL_MANSION_MAP);
217224
this.getOrCreateTagBuilder(TradeTags.CLERIC_NOVICE)
218225
.add(Trades.BUY_ROTTEN_FLESH)
219226
.add(Trades.SELL_REDSTONE);
@@ -372,7 +379,32 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
372379
this.getOrCreateTagBuilder(TradeTags.MASON_MASTER)
373380
.add(Trades.SELL_QUARTZ_PILLAR)
374381
.add(Trades.SELL_QUARTZ_BLOCK);
382+
this.getOrCreateTagBuilder(TradeTags.WANDERING_TRADER_BUYING)
383+
.add(Trades.BUY_WATER_BOTTLE)
384+
.add(Trades.BUY_WATER_BUCKET)
385+
.add(Trades.BUY_MILK_BUCKET)
386+
.add(Trades.BUY_FERMENTED_SPIDER_EYE)
387+
.add(Trades.BUY_BAKED_POTATO)
388+
.add(Trades.BUY_HAY_BLOCK);
389+
this.getOrCreateTagBuilder(TradeTags.WANDERING_TRADER_SPECIAL)
390+
.add(Trades.SELL_PACKED_ICE)
391+
.add(Trades.SELL_BLUE_ICE)
392+
.add(Trades.SELL_GUNPOWDER)
393+
.add(Trades.SELL_PODZOL)
394+
.add(Trades.SELL_ACACIA_LOG)
395+
.add(Trades.SELL_BIRCH_LOG)
396+
.add(Trades.SELL_DARK_OAK_LOG)
397+
.add(Trades.SELL_JUNGLE_LOG)
398+
.add(Trades.SELL_OAK_LOG)
399+
.add(Trades.SELL_SPRUCE_LOG)
400+
.add(Trades.SELL_CHERRY_LOG)
401+
.add(Trades.SELL_MANGROVE_LOG)
402+
.add(Trades.SELL_PALE_OAK_LOG)
403+
.add(Trades.SELL_ENCHANTED_IRON_PICKAXE_WANDERING_TRADER)
404+
.add(Trades.SELL_LONG_INVISIBILITY_POTION);
375405
this.getOrCreateTagBuilder(TradeTags.WANDERING_TRADER_REGULAR)
406+
.add(Trades.SELL_TROPICAL_FISH_BUCKET)
407+
.add(Trades.SELL_PUFFERFISH_BUCKET)
376408
.add(Trades.SELL_SEA_PICKLE)
377409
.add(Trades.SELL_SLIME_BALL)
378410
.add(Trades.SELL_GLOWSTONE_WANDERING_TRADER)
@@ -394,6 +426,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
394426
.add(Trades.SELL_OXEYE_DAISY)
395427
.add(Trades.SELL_CORNFLOWER)
396428
.add(Trades.SELL_LILY_OF_THE_VALLEY)
429+
.add(Trades.SELL_OPEN_EYEBLOSSOM)
397430
.add(Trades.SELL_WHEAT_SEEDS)
398431
.add(Trades.SELL_BEETROOT_SEEDS)
399432
.add(Trades.SELL_PUMPKIN_SEEDS)
@@ -405,6 +438,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
405438
.add(Trades.SELL_OAK_SAPLING)
406439
.add(Trades.SELL_SPRUCE_SAPLING)
407440
.add(Trades.SELL_CHERRY_SAPLING)
441+
.add(Trades.SELL_PALE_OAK_SAPLING)
408442
.add(Trades.SELL_MANGROVE_PROPAGULE)
409443
.add(Trades.SELL_RED_DYE)
410444
.add(Trades.SELL_WHITE_DYE)
@@ -428,6 +462,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
428462
.add(Trades.SELL_HORN_CORAL_BLOCK)
429463
.add(Trades.SELL_TUBE_CORAL_BLOCK)
430464
.add(Trades.SELL_VINE)
465+
.add(Trades.SELL_PALE_HANGING_MOSS)
431466
.add(Trades.SELL_BROWN_MUSHROOM)
432467
.add(Trades.SELL_RED_MUSHROOM)
433468
.add(Trades.SELL_LILY_PAD)
@@ -436,13 +471,10 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
436471
.add(Trades.SELL_RED_SAND)
437472
.add(Trades.SELL_POINTED_DRIPSTONE)
438473
.add(Trades.SELL_ROOTED_DIRT)
439-
.add(Trades.SELL_MOSS_BLOCK);
440-
this.getOrCreateTagBuilder(TradeTags.WANDERING_TRADER_SPECIAL)
441-
.add(Trades.SELL_TROPICAL_FISH_BUCKET)
442-
.add(Trades.SELL_PUFFERFISH_BUCKET)
443-
.add(Trades.SELL_PACKED_ICE)
444-
.add(Trades.SELL_BLUE_ICE)
445-
.add(Trades.SELL_GUNPOWDER)
446-
.add(Trades.SELL_PODZOL);
474+
.add(Trades.SELL_MOSS_BLOCK)
475+
.add(Trades.SELL_PALE_MOSS_BLOCK)
476+
.add(Trades.SELL_WILDFLOWERS)
477+
.add(Trades.SELL_TALL_DRY_GRASS)
478+
.add(Trades.SELL_FIREFLY_BUSH);
447479
}
448480
}

‎src/main/generated/data/minecraft/tags/trade/cartographer_apprentice.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"values": [
33
"minecraft:buy_glass_pane",
4-
"minecraft:sell_monument_map"
4+
"minecraft:sell_taiga_village_map",
5+
"minecraft:sell_swamp_hut_map",
6+
"minecraft:sell_snowy_village_map",
7+
"minecraft:sell_savanna_village_map",
8+
"minecraft:sell_plains_village_map",
9+
"minecraft:sell_jungle_temple_map",
10+
"minecraft:sell_desert_village_map"
511
]
612
}

‎src/main/generated/data/minecraft/tags/trade/cartographer_expert.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
{
22
"values": [
33
"minecraft:sell_item_frame",
4-
"minecraft:sell_white_banner",
5-
"minecraft:sell_blue_banner",
6-
"minecraft:sell_light_blue_banner",
7-
"minecraft:sell_red_banner",
8-
"minecraft:sell_pink_banner",
9-
"minecraft:sell_green_banner",
10-
"minecraft:sell_lime_banner",
11-
"minecraft:sell_gray_banner",
12-
"minecraft:sell_black_banner",
13-
"minecraft:sell_purple_banner",
14-
"minecraft:sell_magenta_banner",
15-
"minecraft:sell_cyan_banner",
16-
"minecraft:sell_brown_banner",
17-
"minecraft:sell_yellow_banner",
18-
"minecraft:sell_orange_banner",
19-
"minecraft:sell_light_gray_banner"
4+
"minecraft:sell_blue_banner_cartographer",
5+
"minecraft:sell_white_banner_cartographer",
6+
"minecraft:sell_red_banner_cartographer",
7+
"minecraft:sell_green_banner_cartographer",
8+
"minecraft:sell_lime_banner_cartographer",
9+
"minecraft:sell_purple_banner_cartographer",
10+
"minecraft:sell_cyan_banner_cartographer",
11+
"minecraft:sell_yellow_banner_cartographer",
12+
"minecraft:sell_orange_banner_cartographer",
13+
"minecraft:sell_brown_banner_cartographer",
14+
"minecraft:sell_magenta_banner_cartographer",
15+
"minecraft:sell_light_blue_banner_cartographer",
16+
"minecraft:sell_pink_banner_cartographer",
17+
"minecraft:sell_gray_banner_cartographer",
18+
"minecraft:sell_black_banner_cartographer"
2019
]
2120
}

‎src/main/generated/data/minecraft/tags/trade/cartographer_journeyman.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"values": [
33
"minecraft:buy_compass",
4-
"minecraft:sell_mansion_map"
4+
"minecraft:sell_monument_map",
5+
"minecraft:sell_trial_chamber_map"
56
]
67
}

‎src/main/generated/data/minecraft/tags/trade/cartographer_master.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"values": [
3-
"minecraft:sell_globe_banner_pattern"
3+
"minecraft:sell_globe_banner_pattern",
4+
"minecraft:sell_mansion_map"
45
]
56
}

‎src/main/generated/data/minecraft/tags/trade/cartographer_novice.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"values": [
3-
"minecraft:buy_paper",
3+
"minecraft:buy_paper_cartographer",
44
"minecraft:sell_map"
55
]
66
}

‎src/main/generated/data/minecraft/tags/trade/librarian_novice.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"values": [
3-
"minecraft:buy_paper",
3+
"minecraft:buy_paper_librarian",
44
"minecraft:sell_enchanted_book_novice",
55
"minecraft:sell_bookshelf"
66
]

‎src/main/generated/data/minecraft/tags/trade/shepherd_apprentice.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"minecraft:buy_black_dye",
66
"minecraft:buy_light_blue_dye",
77
"minecraft:buy_lime_dye",
8-
"minecraft:sell_white_wool",
9-
"minecraft:sell_orange_wool",
10-
"minecraft:sell_magenta_wool",
11-
"minecraft:sell_light_blue_wool",
12-
"minecraft:sell_yellow_wool",
13-
"minecraft:sell_lime_wool",
14-
"minecraft:sell_pink_wool",
15-
"minecraft:sell_gray_wool",
16-
"minecraft:sell_light_gray_wool",
17-
"minecraft:sell_cyan_wool",
18-
"minecraft:sell_purple_wool",
19-
"minecraft:sell_blue_wool",
20-
"minecraft:sell_brown_wool",
21-
"minecraft:sell_green_wool",
22-
"minecraft:sell_red_wool",
23-
"minecraft:sell_black_wool",
8+
"minecraft:sell_white_wool_shepherd",
9+
"minecraft:sell_orange_wool_shepherd",
10+
"minecraft:sell_magenta_wool_shepherd",
11+
"minecraft:sell_light_blue_wool_shepherd",
12+
"minecraft:sell_yellow_wool_shepherd",
13+
"minecraft:sell_lime_wool_shepherd",
14+
"minecraft:sell_pink_wool_shepherd",
15+
"minecraft:sell_gray_wool_shepherd",
16+
"minecraft:sell_light_gray_wool_shepherd",
17+
"minecraft:sell_cyan_wool_shepherd",
18+
"minecraft:sell_purple_wool_shepherd",
19+
"minecraft:sell_blue_wool_shepherd",
20+
"minecraft:sell_brown_wool_shepherd",
21+
"minecraft:sell_green_wool_shepherd",
22+
"minecraft:sell_red_wool_shepherd",
23+
"minecraft:sell_black_wool_shepherd",
2424
"minecraft:sell_white_carpet",
2525
"minecraft:sell_orange_carpet",
2626
"minecraft:sell_magenta_carpet",

0 commit comments

Comments
 (0)