Skip to content

Commit 9097025

Browse files
committed
Updated to 1.20.4 removed qsl
1 parent b527557 commit 9097025

24 files changed

Lines changed: 299 additions & 94 deletions

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
minecraft libs.minecraft
2222
mappings variantOf(libs.quilt.mappings) { classifier 'intermediary-v2' }
2323
modImplementation libs.quilt.loader
24-
modImplementation libs.quilted.fabric.api
24+
// modImplementation libs.quilted.fabric.api
2525
}
2626

2727
processResources {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = true
33

4-
version = 11.0.0
4+
version = 11.1.0
55
maven_group = net.ludocrypt
66
archives_base_name = limlib

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
minecraft = "1.20.1"
3-
quilt_mappings = "1.20.1+build.9"
2+
minecraft = "1.20.4"
3+
quilt_mappings = "1.20.4+build.1"
44
quilt_loader = "0.21.0"
55

66
quilted_fabric_api = "7.4.0+0.90.0-1.20.1"

src/main/java/net/ludocrypt/limlib/api/LimlibRegistryHooks.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
import net.minecraft.registry.RegistryKey;
1515
import net.minecraft.registry.RegistryOps;
1616
import net.minecraft.registry.RegistryOps.RegistryInfoLookup;
17+
import net.minecraft.registry.tag.TagKey;
18+
import net.minecraft.resource.ResourceManager;
19+
import net.minecraft.util.Identifier;
1720

1821
public class LimlibRegistryHooks {
1922

@@ -23,6 +26,8 @@ public class LimlibRegistryHooks {
2326
@Internal
2427
public static final Map<RegistryKey<? extends Registry<?>>, Set<LimlibJsonRegistryHook<?>>> REGISTRY_JSON_HOOKS = Maps
2528
.newHashMap();
29+
@Internal
30+
public static final Map<TagKey<?>, Set<LimlibJsonTagHook<?>>> TAG_JSON_HOOKS = Maps.newHashMap();
2631

2732
public static <O, T extends Registry<O>> void hook(RegistryKey<T> key, LimlibRegistryHook<O> hook) {
2833
Set<LimlibRegistryHook<?>> hooks = REGISTRY_HOOKS.computeIfAbsent(key, k -> Sets.newHashSet());
@@ -34,6 +39,16 @@ public static <O, T extends Registry<O>> void hook(RegistryKey<T> key, LimlibJso
3439
hooks.add(hook);
3540
}
3641

42+
public static <O, T extends Registry<O>> void hook(RegistryKey<T> key, Identifier tag, LimlibJsonTagHook<O> hook) {
43+
Set<LimlibJsonTagHook<?>> hooks = TAG_JSON_HOOKS.computeIfAbsent(TagKey.of(key, tag), k -> Sets.newHashSet());
44+
hooks.add(hook);
45+
}
46+
47+
public static <O> void hook(TagKey<O> key, LimlibJsonTagHook<O> hook) {
48+
Set<LimlibJsonTagHook<?>> hooks = TAG_JSON_HOOKS.computeIfAbsent(key, k -> Sets.newHashSet());
49+
hooks.add(hook);
50+
}
51+
3752
@FunctionalInterface
3853
public interface LimlibRegistryHook<O> {
3954

@@ -61,4 +76,17 @@ void register(RegistryInfoLookup infoLookup, RegistryKey<? extends Registry<O>>
6176

6277
}
6378

79+
@FunctionalInterface
80+
public interface LimlibJsonTagHook<O> {
81+
82+
/**
83+
* @param ResourceManager The resource manager.
84+
* @param tag The tag being hooked into.
85+
* @param jsonElement The jsonElement to modify before being read by a
86+
* CODEC.
87+
*/
88+
void register(ResourceManager manager, TagKey<O> tag, JsonElement jsonElement);
89+
90+
}
91+
6492
}

src/main/java/net/ludocrypt/limlib/api/LimlibTravelling.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Set;
44

55
import org.jetbrains.annotations.ApiStatus.Internal;
6-
import org.quiltmc.qsl.worldgen.dimension.api.QuiltDimensions;
76

87
import net.minecraft.entity.Entity;
98
import net.minecraft.server.network.ServerPlayerEntity;
@@ -28,6 +27,7 @@ public class LimlibTravelling {
2827
@Internal
2928
public static float travelingPitch = 1.0F;
3029

30+
@SuppressWarnings("unchecked")
3131
public static <E extends Entity> E travelTo(E teleported, ServerWorld destination, TeleportTarget target,
3232
SoundEvent sound, float volume, float pitch) {
3333

@@ -70,12 +70,17 @@ public static <E extends Entity> E travelTo(E teleported, ServerWorld destinatio
7070
return teleported;
7171
} else {
7272

73+
((Travelling) teleported).limlib$setTeleportTarget(target);
74+
7375
try {
7476
travelingSound = sound;
7577
travelingVolume = volume;
7678
travelingPitch = pitch;
77-
return QuiltDimensions.teleport(teleported, destination, target);
79+
80+
return (E) teleported.moveToWorld(destination);
81+
7882
} finally {
83+
((Travelling) teleported).limlib$setTeleportTarget(null);
7984
travelingSound = null;
8085
travelingVolume = 0.0F;
8186
travelingPitch = 0.0F;
@@ -85,4 +90,12 @@ public static <E extends Entity> E travelTo(E teleported, ServerWorld destinatio
8590

8691
}
8792

93+
public static interface Travelling {
94+
95+
public TeleportTarget limlib$getTeleportTarget();
96+
97+
public void limlib$setTeleportTarget(TeleportTarget teleportTarget);
98+
99+
}
100+
88101
}

src/main/java/net/ludocrypt/limlib/api/LimlibWorld.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import com.google.common.base.Function;
44
import com.google.common.base.Supplier;
55
import com.google.common.base.Suppliers;
6+
import com.mojang.serialization.Lifecycle;
67

7-
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
8-
import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
8+
import net.ludocrypt.limlib.impl.mixin.RegistriesAccessor;
99
import net.minecraft.registry.HolderProvider;
1010
import net.minecraft.registry.Registry;
1111
import net.minecraft.registry.RegistryKey;
12-
import net.minecraft.registry.SimpleRegistry;
1312
import net.minecraft.util.Identifier;
1413
import net.minecraft.world.dimension.DimensionOptions;
1514
import net.minecraft.world.dimension.DimensionType;
@@ -18,10 +17,8 @@ public class LimlibWorld {
1817

1918
public static final RegistryKey<Registry<LimlibWorld>> LIMLIB_WORLD_KEY = RegistryKey
2019
.ofRegistry(new Identifier("limlib", "limlib_world"));
21-
public static final SimpleRegistry<LimlibWorld> LIMLIB_WORLD = FabricRegistryBuilder
22-
.createSimple(LIMLIB_WORLD_KEY)
23-
.attribute(RegistryAttribute.SYNCED)
24-
.buildAndRegister();
20+
public static final Registry<LimlibWorld> LIMLIB_WORLD = RegistriesAccessor
21+
.callRegisterSimple(LIMLIB_WORLD_KEY, Lifecycle.stable(), registry -> new LimlibWorld(() -> null, (r) -> null));
2522

2623
private Supplier<DimensionType> dimensionTypeSupplier;
2724
private Function<RegistryProvider, DimensionOptions> dimensionOptionsSupplier;

src/main/java/net/ludocrypt/limlib/api/world/NbtPlacerUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import net.minecraft.nbt.NbtInt;
2525
import net.minecraft.nbt.NbtIo;
2626
import net.minecraft.nbt.NbtList;
27+
import net.minecraft.nbt.NbtTagSizeTracker;
2728
import net.minecraft.registry.Registries;
2829
import net.minecraft.resource.Resource;
2930
import net.minecraft.resource.ResourceManager;
@@ -198,7 +199,7 @@ public static Optional<NbtCompound> loadNbtSafe(Identifier id, ResourceManager m
198199

199200
public static NbtCompound readStructure(Resource resource) throws IOException {
200201
InputStream stream = resource.open();
201-
NbtCompound nbt = NbtIo.readCompressed(stream);
202+
NbtCompound nbt = NbtIo.method_10629(stream, NbtTagSizeTracker.method_53898());
202203
stream.close();
203204
return nbt;
204205
}

src/main/java/net/ludocrypt/limlib/api/world/chunk/AbstractNbtChunkGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected void modifyStructure(ChunkRegion region, BlockPos pos, BlockState stat
105105

106106
if (blockEntity instanceof LootableContainerBlockEntity lootTable) {
107107
lootTable
108-
.setLootTable(this.getContainerLootTable(lootTable), region.getSeed() + LimlibHelper.blockSeed(pos));
108+
.method_54867(this.getContainerLootTable(lootTable), region.getSeed() + LimlibHelper.blockSeed(pos));
109109
}
110110

111111
}

src/main/java/net/ludocrypt/limlib/impl/Limlib.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package net.ludocrypt.limlib.impl;
22

3-
import org.quiltmc.loader.api.ModContainer;
43
import org.quiltmc.loader.api.QuiltLoader;
5-
import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
64
import org.slf4j.Logger;
75
import org.slf4j.LoggerFactory;
86

@@ -26,12 +24,11 @@
2624
import net.minecraft.registry.Registry;
2725
import net.minecraft.util.Identifier;
2826

29-
public class Limlib implements ModInitializer {
27+
public class Limlib {
3028

3129
public static final Logger LOGGER = LoggerFactory.getLogger("Limlib");
3230

33-
@Override
34-
public void onInitialize(ModContainer mod) {
31+
public static void onInitialize() {
3532
LimlibWorld.load();
3633
Registry.register(ReverbEffect.REVERB_EFFECT_CODEC, new Identifier("limlib", "static"), StaticReverbEffect.CODEC);
3734
Registry

src/main/java/net/ludocrypt/limlib/impl/LimlibClient.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)