Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.19.3 #3029

Closed
wants to merge 14 commits into from
Closed

1.19.3 #3029

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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Please provide as much information as you can to best help us understand your is

## Donations
All of our work is completely free and non-profit, therefore we are very grateful for all donations made to help support us in running our community.
All of the money made through donations is used to pay for our servers, none of it is taken for profit.
All the money made through donations is used to pay for our servers, none of it is taken for profit.

Donations can be made via our [website](https://meteorclient.com/donations) and the minimum amount to get donor benefits is €5.
You will be rewarded with a role on our Discord server, an in-game cape, and an extra kit as well as donor status on our [PvP server](https://namemc.com/server/pvp.meteorclient.com).
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}
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/develop)
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.9
loader_version=0.14.9
fapi_version=0.60.0+1.19.2
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.1
loader_version=0.14.11
fapi_version=0.68.1+1.19.3

# Mod Properties
mod_version=0.5.1
mod_version=0.5.2
maven_group=meteordevelopment
archives_base_name=meteor-client

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import meteordevelopment.meteorclient.utils.misc.ISerializable;
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.block.Block;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
Expand Down Expand Up @@ -57,7 +57,7 @@ public void initWidgets() {
}

public <T extends ICopyable<T> & ISerializable<T> & IChangeable & IBlockData<T>> void initTable() {
for (Block block : Registry.BLOCK) {
for (Block block : Registries.BLOCK) {
T blockData = (T) setting.get().get(block);

if (blockData != null && blockData.isChanged()) BLOCKS.add(0, block);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

import java.util.List;
import java.util.function.Predicate;
Expand All @@ -23,7 +23,7 @@ public class BlockListSettingScreen extends LeftRightListSettingScreen<Block> {
private static final Identifier ID = new Identifier("minecraft", "");

public BlockListSettingScreen(GuiTheme theme, Setting<List<Block>> setting) {
super(theme, "Select Blocks", setting, setting.get(), Registry.BLOCK);
super(theme, "Select Blocks", setting, setting.get(), Registries.BLOCK);
}

@Override
Expand All @@ -46,15 +46,15 @@ protected String getValueName(Block value) {

@Override
protected boolean skipValue(Block value) {
return Registry.BLOCK.getId(value).getPath().endsWith("_wall_banner");
return Registries.BLOCK.getId(value).getPath().endsWith("_wall_banner");
}

@Override
protected Block getAdditionalValue(Block value) {
String path = Registry.BLOCK.getId(value).getPath();
String path = Registries.BLOCK.getId(value).getPath();
if (!path.endsWith("_banner")) return null;

((IdentifierAccessor) ID).setPath(path.substring(0, path.length() - 6) + "wall_banner");
return Registry.BLOCK.get(ID);
return Registries.BLOCK.get(ID);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;
import org.apache.commons.lang3.StringUtils;

public class BlockSettingScreen extends WindowScreen {
Expand Down Expand Up @@ -49,7 +49,7 @@ public void initWidgets() {
}

private void initTable() {
for (Block block : Registry.BLOCK) {
for (Block block : Registries.BLOCK) {
if (setting.filter != null && !setting.filter.test(block)) continue;
if (skipValue(block)) continue;

Expand All @@ -68,6 +68,6 @@ private void initTable() {
}

protected boolean skipValue(Block value) {
return value == Blocks.AIR || Registry.BLOCK.getId(value).getPath().endsWith("_wall_banner");
return value == Blocks.AIR || Registries.BLOCK.getId(value).getPath().endsWith("_wall_banner");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;

import java.util.List;

public class EnchantmentListSettingScreen extends LeftRightListSettingScreen<Enchantment> {
public EnchantmentListSettingScreen(GuiTheme theme, Setting<List<Enchantment>> setting) {
super(theme, "Select Enchantments", setting, setting.get(), Registry.ENCHANTMENT);
super(theme, "Select Enchantments", setting, setting.get(), Registries.ENCHANTMENT);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.entity.EntityType;
import net.minecraft.registry.Registries;
import net.minecraft.util.Pair;
import net.minecraft.util.registry.Registry;

import java.util.ArrayList;
import java.util.Comparator;
Expand Down Expand Up @@ -161,10 +161,10 @@ public void initWidgets() {

// Sort all entities
if (filterText.isEmpty()) {
Registry.ENTITY_TYPE.forEach(entityTypeForEach);
Registries.ENTITY_TYPE.forEach(entityTypeForEach);
} else {
List<Pair<EntityType<?>, Integer>> entities = new ArrayList<>();
Registry.ENTITY_TYPE.forEach(entity -> {
Registries.ENTITY_TYPE.forEach(entity -> {
int words = Utils.searchInWords(Names.get(entity), filterText);
int diff = Utils.searchLevenshteinDefault(Names.get(entity), filterText, false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;

import java.util.function.Predicate;

public class ItemListSettingScreen extends LeftRightListSettingScreen<Item> {
public ItemListSettingScreen(GuiTheme theme, ItemListSetting setting) {
super(theme, "Select Items", setting, setting.get(), Registry.ITEM);
super(theme, "Select Items", setting, setting.get(), Registries.ITEM);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;
import org.apache.commons.lang3.StringUtils;

public class ItemSettingScreen extends WindowScreen {
Expand Down Expand Up @@ -48,7 +48,7 @@ public void initWidgets() {
}

public void initTable() {
for (Item item : Registry.ITEM) {
for (Item item : Registries.ITEM) {
if (setting.filter != null && !setting.filter.test(item)) continue;
if (item == Items.AIR) continue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import meteordevelopment.meteorclient.gui.widgets.pressable.WPressable;
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.utils.Utils;
import net.minecraft.registry.Registry;
import net.minecraft.util.Pair;
import net.minecraft.util.registry.Registry;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.particle.ParticleType;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;

import java.util.List;

public class ParticleTypeListSettingScreen extends LeftRightListSettingScreen<ParticleType<?>> {
public ParticleTypeListSettingScreen(GuiTheme theme, Setting<List<ParticleType<?>>> setting) {
super(theme, "Select Particles", setting, setting.get(), Registry.PARTICLE_TYPE);
super(theme, "Select Particles", setting, setting.get(), Registries.PARTICLE_TYPE);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import meteordevelopment.meteorclient.gui.widgets.WWidget;
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.utils.misc.Names;
import net.minecraft.registry.Registries;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.registry.Registry;

import java.util.List;

public class SoundEventListSettingScreen extends LeftRightListSettingScreen<SoundEvent> {
public SoundEventListSettingScreen(GuiTheme theme, Setting<List<SoundEvent>> setting) {
super(theme, "Select Sounds", setting, setting.get(), Registry.SOUND_EVENT);
super(theme, "Select Sounds", setting, setting.get(), Registries.SOUND_EVENT);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import net.minecraft.item.Items;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionUtil;
import net.minecraft.util.registry.Registry;
import net.minecraft.registry.Registries;

import java.util.List;

public class StatusEffectListSettingScreen extends LeftRightListSettingScreen<StatusEffect> {
public StatusEffectListSettingScreen(GuiTheme theme, Setting<List<StatusEffect>> setting) {
super(theme, "Select Effects", setting, setting.get(), Registry.STATUS_EFFECT);
super(theme, "Select Effects", setting, setting.get(), Registries.STATUS_EFFECT);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
package meteordevelopment.meteorclient.mixin;

import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.client.gui.screen.ingame.SignEditScreen;
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(SignEditScreen.class)
public interface SignEditScreenAccessor {
@Accessor("sign")
@Mixin(AbstractSignEditScreen.class)
public interface AbstractSignEditScreenAccessor {
@Accessor("blockEntity")
SignBlockEntity getSign();
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import net.minecraft.client.render.block.entity.BannerBlockEntityRenderer;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.Vec3f;
import net.minecraft.util.math.RotationAxis;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down Expand Up @@ -61,7 +61,7 @@ private void renderPillar(BannerBlockEntity bannerBlockEntity, MatrixStack matri
BlockState blockState = bannerBlockEntity.getCachedState();
matrixStack.translate(0.5D, 0.5D, 0.5D);
float h = (float)(-(Integer)blockState.get(BannerBlock.ROTATION) * 360) / 16.0F;
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(h));
matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(h));
matrixStack.push();
matrixStack.scale(0.6666667F, -0.6666667F, -0.6666667F);
VertexConsumer vertexConsumer = ModelLoader.BANNER_BASE.getVertexConsumer(vertexConsumerProvider, RenderLayer::getEntitySolid);
Expand All @@ -75,7 +75,7 @@ private void renderCrossbar(BannerBlockEntity bannerBlockEntity, MatrixStack mat
BlockState blockState = bannerBlockEntity.getCachedState();
matrixStack.translate(0.5D, -0.1666666716337204D, 0.5D);
float h = -blockState.get(WallBannerBlock.FACING).asRotation();
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(h));
matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(h));
matrixStack.translate(0.0D, -0.3125D, -0.4375D);
matrixStack.push();
matrixStack.scale(0.6666667F, -0.6666667F, -0.6666667F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

@Mixin(BeaconScreen.class)
public abstract class BeaconScreenMixin extends HandledScreen<BeaconScreenHandler> {
//This warning is normal, do not change the code here
@Shadow
protected abstract <T extends ClickableWidget> void addButton(T button);

Expand Down
Loading