Skip to content

Commit

Permalink
Revert "Update dependencies"
Browse files Browse the repository at this point in the history
This reverts commit 7ffc17d.
  • Loading branch information
kyrptonaught committed Apr 11, 2024
1 parent 88fff7a commit 6c95fae
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ dependencies {
//Discord Bridge
shadow implementation("net.dv8tion:JDA:5.0.0-beta.20") { exclude module: 'opus-java' }

shadow implementation("io.javalin:javalin:6.1.2")
shadow implementation("io.javalin:javalin:6.0.1")

//Apache Compress
shadow implementation("org.apache.commons:commons-compress:1.26.0")
shadow implementation("org.apache.commons:commons-compress:1.25.0")
}

loom {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx2G
# Fabric Properties
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.7
loader_version=0.15.6

#Fabric api
fabric_version=0.96.4+1.20.4
fabric_version=0.95.4+1.20.4

# Mod Properties
mod_version=1.0.8b8-1.20.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
import net.minecraft.server.network.ServerCommonNetworkHandler;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
public class AdvancementMenuMod extends Module {
public static String EXECUTE_COMMAND;

@Override
public void onInitialize() {
super.onInitialize();

}

@Override
public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher) {
dispatcher.register(CommandManager.literal("advancementmenu")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher)
DimensionLoaderCommand.registerCommands(dispatcher);
}

public static void loadDimension(Identifier id, Identifier dimID, Consumer<MinecraftServer> onComplete) {
public static void loadDimension(Identifier id, Identifier dimID, Consumer<MinecraftServer> onComplete ) {
loadedWorlds.put(id, new CustomDimHolder(id, dimID, onComplete));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
import net.minecraft.network.packet.BrandCustomPayload;
import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ConnectedClientData;
import net.minecraft.server.network.ServerCommonNetworkHandler;
import net.minecraft.server.network.ServerConfigurationNetworkHandler;
import net.minecraft.server.network.*;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;


@Mixin(ServerConfigurationNetworkHandler.class)
public abstract class ServerConfigNetworkHandlerMixin extends ServerCommonNetworkHandler {
public abstract class ServerConfigNetworkHandlerMixin extends ServerCommonNetworkHandler {


@Shadow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.kyrptonaught.serverutils.mixin.healthSpoofer;

import com.mojang.authlib.GameProfile;
import net.minecraft.block.BlockState;
import net.minecraft.entity.attribute.EntityAttributeInstance;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.player.PlayerEntity;
Expand All @@ -9,6 +10,7 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

import java.util.Collections;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.kyrptonaught.serverutils.Module;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.command.argument.PosArgument;
import net.minecraft.command.argument.Vec3ArgumentType;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.effect.StatusEffectInstance;
Expand All @@ -17,12 +19,10 @@
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.*;

public class PlayerLockdownMod extends Module {
public static boolean GLOBAL_LOCKDOWN = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.kyrptonaught.serverutils.ServerUtilsMod;
import net.minecraft.advancement.criterion.Criteria;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.network.packet.s2c.common.ResourcePackRemoveS2CPacket;
import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket;
import net.minecraft.server.command.CommandManager;
Expand All @@ -25,7 +26,7 @@ public class SwitchableResourcepacksMod extends ModuleWConfig<ResourcePackConfig
public static final HashMap<String, ResourcePackConfig.RPOption> rpOptionHashMap = new HashMap<>();
public static CustomCriterion STARTED, FINISHED, FAILED;

public static final HashMap<UUID, String> playerLoaded = new HashMap<>();
public static final HashMap<UUID,String> playerLoaded = new HashMap<>();

public void onConfigLoad(ResourcePackConfig config) {
rpOptionHashMap.clear();
Expand Down

0 comments on commit 6c95fae

Please sign in to comment.