Bump to 1.19.4
This commit is contained in:
parent
de8df562de
commit
ca09970fda
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.11-SNAPSHOT'
|
id 'fabric-loom' version '1.2-SNAPSHOT'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx1G
|
||||||
minecraft_version=1.19
|
org.gradle.parallel=true
|
||||||
yarn_mappings=1.19+build.2
|
minecraft_version=1.19.4
|
||||||
loader_version=0.14.7
|
yarn_mappings=1.19.4+build.2
|
||||||
|
loader_version=0.14.19
|
||||||
mod_version=1.2.0
|
mod_version=1.2.0
|
||||||
maven_group=party._2a03.mc
|
maven_group=party._2a03.mc
|
||||||
archives_base_name=minecraft-tweaks-2a03
|
archives_base_name=minecraft-tweaks-2a03
|
||||||
fabric_version=0.55.3+1.19
|
fabric_version=0.79.0+1.19.4
|
||||||
|
|
|
@ -3,11 +3,11 @@ package party._2a03.mc.command;
|
||||||
import com.mojang.brigadier.CommandDispatcher;
|
import com.mojang.brigadier.CommandDispatcher;
|
||||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
|
import net.minecraft.registry.RegistryKey;
|
||||||
import net.minecraft.server.command.CommandManager;
|
import net.minecraft.server.command.CommandManager;
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.server.command.ServerCommandSource;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
|
||||||
import party._2a03.mc.util.Database;
|
import party._2a03.mc.util.Database;
|
||||||
import party._2a03.mc.util.PlayerData;
|
import party._2a03.mc.util.PlayerData;
|
||||||
import party._2a03.mc.util.PlayerPosition;
|
import party._2a03.mc.util.PlayerPosition;
|
||||||
|
|
|
@ -2,11 +2,11 @@ package party._2a03.mc.command;
|
||||||
|
|
||||||
import com.mojang.brigadier.CommandDispatcher;
|
import com.mojang.brigadier.CommandDispatcher;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
|
import net.minecraft.registry.RegistryKey;
|
||||||
import net.minecraft.server.command.CommandManager;
|
import net.minecraft.server.command.CommandManager;
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.server.command.ServerCommandSource;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
|
||||||
import party._2a03.mc.util.Config;
|
import party._2a03.mc.util.Config;
|
||||||
import party._2a03.mc.util.PlayerPosition;
|
import party._2a03.mc.util.PlayerPosition;
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,12 @@ public abstract class MixinCreeperEntity extends HostileEntity {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Redirect(method = "explode()V", at = @At(value = "INVOKE",
|
@Redirect(method = "explode()V", at = @At(value = "INVOKE",
|
||||||
target = "Lnet/minecraft/world/World;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/explosion/Explosion$DestructionType;)Lnet/minecraft/world/explosion/Explosion;"))
|
target = "Lnet/minecraft/world/World;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)Lnet/minecraft/world/explosion/Explosion;"))
|
||||||
private Explosion OnCreeperExplode(World self, Entity entity,
|
private Explosion OnCreeperExplode(World self, Entity entity,
|
||||||
double x, double y, double z, float r,
|
double x, double y, double z, float r,
|
||||||
Explosion.DestructionType destructionType) {
|
World.ExplosionSourceType explosionSourceType) {
|
||||||
if (Config.getBool("disableCreeperExplosions"))
|
if (Config.getBool("disableCreeperExplosions"))
|
||||||
destructionType = Explosion.DestructionType.NONE;
|
explosionSourceType = World.ExplosionSourceType.NONE;
|
||||||
return self.createExplosion(entity, x, y, z, r, destructionType);
|
return self.createExplosion(entity, x, y, z, r, explosionSourceType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package party._2a03.mc.mixin;
|
package party._2a03.mc.mixin;
|
||||||
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.registry.RegistryKey;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
@ -18,7 +18,7 @@ public abstract class MixinServerPlayerEntity extends PlayerEntity {
|
||||||
private RegistryKey<World> spawnPointDimension;
|
private RegistryKey<World> spawnPointDimension;
|
||||||
|
|
||||||
public MixinServerPlayerEntity() {
|
public MixinServerPlayerEntity() {
|
||||||
super(null, null, 0, null, null);
|
super(null, null, 0, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "moveToSpawn", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "moveToSpawn", at = @At("HEAD"), cancellable = true)
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
package party._2a03.mc.util;
|
package party._2a03.mc.util;
|
||||||
|
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
|
import net.minecraft.registry.Registry;
|
||||||
|
import net.minecraft.registry.RegistryKey;
|
||||||
|
import net.minecraft.registry.RegistryKeys;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
|
||||||
|
|
||||||
public class PlayerPosition {
|
public class PlayerPosition {
|
||||||
public double x;
|
public double x;
|
||||||
|
@ -24,7 +25,7 @@ public class PlayerPosition {
|
||||||
this.z = data.getDouble(2);
|
this.z = data.getDouble(2);
|
||||||
this.yaw = data.getNumber(3).floatValue();
|
this.yaw = data.getNumber(3).floatValue();
|
||||||
this.pitch = data.getNumber(4).floatValue();
|
this.pitch = data.getNumber(4).floatValue();
|
||||||
this.registrykey = RegistryKey.of(Registry.DIMENSION_KEY, new Identifier(registry_string));
|
this.registrykey = RegistryKey.of(RegistryKeys.DIMENSION, new Identifier(registry_string));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,9 @@
|
||||||
"minecraft-tweaks-2a03.mixins.json"
|
"minecraft-tweaks-2a03.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.7",
|
"fabricloader": ">=0.14.19",
|
||||||
"fabric": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19"
|
"minecraft": "1.19.4",
|
||||||
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue