Skip to content

Commit

Permalink
Merge pull request #20 from ThebestkillerTBK/main
Browse files Browse the repository at this point in the history
update 1.19.3
  • Loading branch information
maxsupermanhd authored Dec 17, 2022
2 parents d06788d + cc7f6b7 commit 07401b8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.ajoberstar.grgit' version '5.0.0'
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '1.0-SNAPSHOT'
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/versions.html)
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.1
loader_version=0.14.9
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.2
loader_version=0.14.11

# Mod Properties
mod_version=1.3.4
mod_version=1.3.5
maven_group=meteordevelopment.addons
archives_base_name=villager-roller

meteor_version=0.5.1-SNAPSHOT
meteor_version=0.5.2-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.*;
import net.minecraft.registry.Registries;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.village.TradeOffer;
import net.minecraft.village.TradeOfferList;
import net.minecraft.village.VillagerProfession;
Expand All @@ -47,7 +47,6 @@
import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
import java.util.stream.Collectors;

import static net.minecraft.sound.SoundEvents.BLOCK_AMETHYST_CLUSTER_BREAK;

Expand Down Expand Up @@ -346,7 +345,7 @@ private void fillWidget(GuiTheme theme, WVerticalList list) {
addAll.action = () -> {
list.clear();
searchingEnchants.clear();
for (Enchantment e : Registry.ENCHANTMENT.stream().filter(Enchantment::isAvailableForEnchantedBookOffer).toList()) {
for (Enchantment e : Registries.ENCHANTMENT.stream().filter(Enchantment::isAvailableForEnchantedBookOffer).toList()) {
searchingEnchants.add(new rollingEnchantment(e, e.getMaxLevel(), getMinimumPrice(e, e.getMaxLevel()), false));
}
fillWidget(theme, list);
Expand All @@ -366,7 +365,7 @@ public interface EnchantmentSelectCallback {
}

public static class EnchantmentSelectScreen extends WindowScreen {
private final List<Enchantment> available = Registry.ENCHANTMENT.stream().filter(Enchantment::isAvailableForEnchantedBookOffer).toList();
private final List<Enchantment> available = Registries.ENCHANTMENT.stream().filter(Enchantment::isAvailableForEnchantedBookOffer).toList();
private final GuiTheme theme;
private final EnchantmentSelectCallback callback;

Expand Down Expand Up @@ -535,7 +534,7 @@ public rollingEnchantment() {
@Override
public NbtCompound toTag() {
NbtCompound tag = new NbtCompound();
tag.putInt("enchantment", Registry.ENCHANTMENT.getRawId(this.enchantment));
tag.putInt("enchantment", Registries.ENCHANTMENT.getRawId(this.enchantment));
tag.putInt("minLevel", this.minLevel);
tag.putInt("maxCost", this.maxCost);
tag.putBoolean("enabled", this.enabled);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"depends": {
"java": ">=17",
"minecraft": "1.19.2",
"minecraft": "1.19.3",
"meteor-client": ">0.4.5"
}
}

0 comments on commit 07401b8

Please sign in to comment.