Skip to content

Commit 94035bf

Browse files
ErrorCraftErrorCraft
committed
Port to 25w08a
1 parent ddfa7a4 commit 94035bf

10 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎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=25w07a
7-
yarn_mappings=25w07a+build.12
6+
minecraft_version=25w08a
7+
yarn_mappings=25w08a+build.6
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.117.3+1.21.5
16+
fabric_version=0.118.0+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;Lnet/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/ItemDisplayContext;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
140140
ordinal = 0
141141
)
142142
)

‎src/client/java/net/errorcraft/itematic/mixin/client/render/item/property/select/ChargeTypePropertyExtender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@Mixin(ChargeTypeProperty.class)
1212
public class ChargeTypePropertyExtender {
1313
@Redirect(
14-
method = "getValue(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/entity/LivingEntity;ILnet/minecraft/item/ModelTransformationMode;)Lnet/minecraft/item/CrossbowItem$ChargeType;",
14+
method = "getValue(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/entity/LivingEntity;ILnet/minecraft/item/ItemDisplayContext;)Lnet/minecraft/item/CrossbowItem$ChargeType;",
1515
at = @At(
1616
value = "INVOKE",
1717
target = "Lnet/minecraft/component/type/ChargedProjectilesComponent;contains(Lnet/minecraft/item/Item;)Z"

‎src/main/generated/data/minecraft/trade/buy_baked_potato.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"gives": {
33
"item": "minecraft:emerald"
44
},
5-
"max_uses": 1,
5+
"max_uses": 2,
66
"price_multiplier": 0.05,
77
"wants": [
88
{

‎src/main/generated/data/minecraft/trade/buy_fermented_spider_eye.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"count": 3,
44
"item": "minecraft:emerald"
55
},
6-
"max_uses": 1,
6+
"max_uses": 2,
77
"price_multiplier": 0.05,
88
"wants": [
99
{

‎src/main/generated/data/minecraft/trade/buy_hay_block.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"gives": {
33
"item": "minecraft:emerald"
44
},
5-
"max_uses": 1,
5+
"max_uses": 2,
66
"price_multiplier": 0.05,
77
"wants": [
88
{

‎src/main/generated/data/minecraft/trade/buy_milk_bucket.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"count": 2,
44
"item": "minecraft:emerald"
55
},
6-
"max_uses": 1,
6+
"max_uses": 2,
77
"price_multiplier": 0.05,
88
"wants": [
99
{

‎src/main/generated/data/minecraft/trade/buy_water_bottle.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"gives": {
33
"item": "minecraft:emerald"
44
},
5-
"max_uses": 12,
5+
"max_uses": 2,
66
"price_multiplier": 0.05,
77
"wants": [
88
{

‎src/main/generated/data/minecraft/trade/buy_water_bucket.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"count": 2,
44
"item": "minecraft:emerald"
55
},
6-
"max_uses": 1,
6+
"max_uses": 2,
77
"price_multiplier": 0.05,
88
"wants": [
99
{

‎src/main/java/net/errorcraft/itematic/village/trade/Trades.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -793,12 +793,12 @@ public static void bootstrap(Registerable<Trade> registerable) {
793793
registerable.register(SELL_FIREFLY_BUSH, sell(items, items.getOrThrow(ItemKeys.FIREFLY_BUSH), 1, 5, TradeOffersAccessor.noviceSellTradeExperience(), 1));
794794
registerable.register(SELL_TROPICAL_FISH_BUCKET, sell(items, items.getOrThrow(ItemKeys.TROPICAL_FISH_BUCKET), 1, 4, 1, 5));
795795
registerable.register(SELL_PUFFERFISH_BUCKET, sell(items, items.getOrThrow(ItemKeys.PUFFERFISH_BUCKET), 1, 4, 1, 5));
796-
registerable.register(BUY_WATER_BOTTLE, buyWithPotion(items, potions.getOrThrow(PotionKeys.WATER), items.getOrThrow(ItemKeys.POTION), 1));
797-
registerable.register(BUY_WATER_BUCKET, buy(items, items.getOrThrow(ItemKeys.WATER_BUCKET), 1, 2, 1, 1));
798-
registerable.register(BUY_MILK_BUCKET, buy(items, items.getOrThrow(ItemKeys.MILK_BUCKET), 1, 2, 1, 1));
799-
registerable.register(BUY_FERMENTED_SPIDER_EYE, buy(items, items.getOrThrow(ItemKeys.FERMENTED_SPIDER_EYE), 1, 3, 1, 1));
800-
registerable.register(BUY_BAKED_POTATO, buy(items, items.getOrThrow(ItemKeys.BAKED_POTATO), 4, 1, 1, 1));
801-
registerable.register(BUY_HAY_BLOCK, buy(items, items.getOrThrow(ItemKeys.HAY_BLOCK), 1, 1, 1, 1));
796+
registerable.register(BUY_WATER_BOTTLE, buyWithPotion(items, potions.getOrThrow(PotionKeys.WATER), items.getOrThrow(ItemKeys.POTION)));
797+
registerable.register(BUY_WATER_BUCKET, buy(items, items.getOrThrow(ItemKeys.WATER_BUCKET), 1, 2, 2, 1));
798+
registerable.register(BUY_MILK_BUCKET, buy(items, items.getOrThrow(ItemKeys.MILK_BUCKET), 1, 2, 2, 1));
799+
registerable.register(BUY_FERMENTED_SPIDER_EYE, buy(items, items.getOrThrow(ItemKeys.FERMENTED_SPIDER_EYE), 1, 3, 2, 1));
800+
registerable.register(BUY_BAKED_POTATO, buy(items, items.getOrThrow(ItemKeys.BAKED_POTATO), 4, 1, 2, 1));
801+
registerable.register(BUY_HAY_BLOCK, buy(items, items.getOrThrow(ItemKeys.HAY_BLOCK), 1, 1, 2, 1));
802802
registerable.register(SELL_PACKED_ICE, sell(items, items.getOrThrow(ItemKeys.PACKED_ICE), 1, 6, 1, 3));
803803
registerable.register(SELL_BLUE_ICE, sell(items, items.getOrThrow(ItemKeys.BLUE_ICE), 1, 6, 1, 6));
804804
registerable.register(SELL_GUNPOWDER, sell(items, items.getOrThrow(ItemKeys.GUNPOWDER), 1, 8, 1, 1));
@@ -840,10 +840,11 @@ private static Trade buyFromType(RegistryEntryLookup<Item> items, RegistryEntry<
840840
.build();
841841
}
842842

843-
private static Trade buyWithPotion(RegistryEntryLookup<Item> items, RegistryEntry<Potion> potion, RegistryEntry<Item> item, int tradeExperience) {
843+
private static Trade buyWithPotion(RegistryEntryLookup<Item> items, RegistryEntry<Potion> potion, RegistryEntry<Item> item) {
844844
return Trade.builder(Trade.Entry.ofEmerald(items))
845845
.wants(Trade.Entry.of(item, 1, SetPotionLootFunction.builder(potion).build()))
846-
.tradeExperience(tradeExperience)
846+
.maxUses(2)
847+
.tradeExperience(1)
847848
.build();
848849
}
849850

0 commit comments

Comments
 (0)