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.

Sign up for GitHub

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

Update to 1.21 (fabric) #412

Merged
merged 2 commits into from
Jun 16, 2024
Merged

Update to 1.21 (fabric) #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d2370e
Updare to 24w21b
DrexHD May 24, 2024
a4798ce
Update to 1.21
DrexHD Jun 14, 2024
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
10 changes: 5 additions & 5 deletions spark-fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ configurations {

dependencies {
// https://modmuss50.me/fabric.html
minecraft 'com.mojang:minecraft:1.20.6'
mappings 'net.fabricmc:yarn:1.20.6+build.1:v2'
modImplementation 'net.fabricmc:fabric-loader:0.15.10'
minecraft 'com.mojang:minecraft:1.21'
mappings 'net.fabricmc:yarn:1.21+build.1:v2'
modImplementation 'net.fabricmc:fabric-loader:0.15.11'

Set<String> apiModules = [
"fabric-api-base",
Expand All @@ -40,12 +40,12 @@ dependencies {

// Add each module as a dependency
apiModules.forEach {
modImplementation(fabricApi.module(it, '0.97.8+1.20.6'))
modImplementation(fabricApi.module(it, '0.100.1+1.21'))
}

include(modImplementation('me.lucko:fabric-permissions-api:0.3.1'))

modImplementation('eu.pb4:placeholder-api:2.4.0-pre.1+1.20.5')
modImplementation('eu.pb4:placeholder-api:2.4.0-pre.2+1.21')

shade project(':spark-common')
}
Expand Down
2 changes: 1 addition & 1 deletion spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import me.lucko.spark.fabric.mixin.ServerWorldAccessor;

import net.minecraft.client.MinecraftClient;
import net.minecraft.client.world.ClientEntityManager;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.world.ServerEntityManager;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.entity.ClientEntityManager;
import net.minecraft.world.entity.EntityIndex;
import net.minecraft.world.entity.EntityTrackingSection;
import net.minecraft.world.entity.SectionedEntityCache;
Expand Down
2 changes: 1 addition & 1 deletion spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientEntityManagerAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

package me.lucko.spark.fabric.mixin;

import net.minecraft.client.world.ClientEntityManager;
import net.minecraft.entity.Entity;
import net.minecraft.world.entity.ClientEntityManager;
import net.minecraft.world.entity.EntityIndex;
import net.minecraft.world.entity.SectionedEntityCache;

Expand Down
2 changes: 1 addition & 1 deletion spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientWorldAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

package me.lucko.spark.fabric.mixin;

import net.minecraft.client.world.ClientEntityManager;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.Entity;

import net.minecraft.world.entity.ClientEntityManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

Expand Down
2 changes: 1 addition & 1 deletion spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public enum SparkFabricPlaceholderApi {
public static void register(SparkPlatform platform) {
for (SparkPlaceholder placeholder : SparkPlaceholder.values()) {
Placeholders.register(
new Identifier("spark", placeholder.getName()),
Identifier.of("spark", placeholder.getName()),
new Handler(platform, placeholder)
);
}
Expand Down
Loading