Skip to content

Commit 276482a

Browse files
DaFuqsDaFuqs
authored
Merge pull request #14 from imreallybadatnames/1.20.5
Initial 1.20.5 port
2 parents 292002d + 2702b81 commit 276482a

25 files changed

+85
-82
lines changed

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_17
7-
targetCompatibility = JavaVersion.VERSION_17
6+
sourceCompatibility = JavaVersion.VERSION_21
7+
targetCompatibility = JavaVersion.VERSION_21
88

99
archivesBaseName = project.archives_base_name
1010
version = project.mod_version
@@ -47,7 +47,7 @@ processResources {
4747
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
4848
tasks.withType(JavaCompile) {
4949
options.encoding = "UTF-8"
50-
it.options.release = 17 // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
50+
it.options.release = 21 // Minecraft 1.20.5 upwards uses Java 21.
5151
}
5252

5353
java {

‎examples/example_revelations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"advancement": "minecraft:adventure/root",
33
"block_states": {
4-
"minecraft:grass": "minecraft:beacon",
4+
"minecraft:short_grass": "minecraft:beacon",
55
"minecraft:tall_grass": "minecraft:obsidian",
66
"minecraft:tall_grass[half=upper]": "minecraft:netherite_block"
77
},
@@ -16,6 +16,6 @@
1616
"minecraft:gold_ore": "Since Gold Ore is not in the items tag above, you should never see this"
1717
},
1818
"block_name_replacements": {
19-
"minecraft:grass": "block.minecraft.dandelion"
19+
"minecraft:short_grass": "block.minecraft.dandelion"
2020
}
2121
}

‎examples/revelationary_demo_datapack.zip

1 Byte
Binary file not shown.

‎gradle.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
org.gradle.jvmargs = -Xmx2G
33

44
# Fabric Properties
5-
minecraft_version=1.20.4
6-
yarn_mappings=1.20.4+build.3
7-
loader_version=0.15.9
5+
minecraft_version=1.20.5
6+
yarn_mappings=1.20.5+build.1
7+
loader_version=0.15.10
88

99
# Mod Properties
10-
mod_version = 1.3.7+1.20.4
10+
mod_version = 1.3.7+1.20.5
1111
maven_group = de.dafuqs.revelationary
1212
archives_base_name = revelationary
1313

1414
# https://fabricmc.net/develop/
15-
fabric_version=0.96.11+1.20.4
15+
fabric_version=0.97.8+1.20.5
1616

17-
jade_version=fNHCa6bl
18-
wthit_version=10.5.0
17+
jade_version=lwgbRGaY
18+
wthit_version=11.1.2

‎jitpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jdk:
2-
- openjdk17
2+
- openjdk21
33
env:
44
ENVIRONMENT: "production"

‎src/main/java/de/dafuqs/revelationary/ClientAdvancements.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import de.dafuqs.revelationary.mixin.client.AccessorClientAdvancementManager;
55
import net.fabricmc.api.EnvType;
66
import net.fabricmc.api.Environment;
7-
import net.minecraft.advancement.Advancement;
87
import net.minecraft.advancement.AdvancementEntry;
98
import net.minecraft.advancement.AdvancementProgress;
109
import net.minecraft.client.MinecraftClient;
@@ -49,9 +48,9 @@ public static boolean hasDone(Identifier identifier) {
4948
ClientPlayNetworkHandler conn = MinecraftClient.getInstance().getNetworkHandler();
5049
if (conn != null) {
5150
ClientAdvancementManager cm = conn.getAdvancementHandler();
52-
Advancement adv = cm.getManager().get(identifier).getAdvancement();
51+
AdvancementEntry adv = cm.getManager().get(identifier).getAdvancementEntry();
5352
if (adv != null) {
54-
Map<Advancement, AdvancementProgress> progressMap = ((AccessorClientAdvancementManager) cm).getAdvancementProgresses();
53+
Map<AdvancementEntry, AdvancementProgress> progressMap = ((AccessorClientAdvancementManager) cm).getAdvancementProgresses();
5554
AdvancementProgress progress = progressMap.get(adv);
5655
return progress != null && progress.isDone();
5756
}

‎src/main/java/de/dafuqs/revelationary/ClientRevelationHolder.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void processNewAdvancements(Set<Identifier> doneAdvancements, bool
4040
}
4141
}
4242

43-
if (revealedBlockStates.size() > 0) {
43+
if (!revealedBlockStates.isEmpty()) {
4444
// uncloak the blocks
4545
for (BlockState revealedBlockState : revealedBlockStates) {
4646
activeBlockStateSwaps.remove(revealedBlockState);
@@ -88,18 +88,12 @@ public static void processRemovedAdvancements(@NotNull Set<Identifier> removedAd
8888
}
8989
}
9090

91-
if (concealedBlockStates.size() > 0) {
91+
if (!concealedBlockStates.isEmpty()) {
9292
// uncloak the blocks
9393
for (BlockState concealedBlockState : concealedBlockStates) {
94-
if (!activeBlockStateSwaps.contains(concealedBlockState)) {
95-
activeBlockStateSwaps.add(concealedBlockState);
96-
}
94+
activeBlockStateSwaps.add(concealedBlockState);
9795
Item blockItem = concealedBlockState.getBlock().asItem();
98-
if (blockItem != null) {
99-
if (!activeItemSwaps.contains(blockItem)) {
100-
activeItemSwaps.add(blockItem);
101-
}
102-
}
96+
if (blockItem != null) activeItemSwaps.add(blockItem);
10397
}
10498
rebuildAllChunks();
10599
}

‎src/main/java/de/dafuqs/revelationary/Commands.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import net.minecraft.text.Text;
1616

1717
import java.util.Collection;
18-
import java.util.function.Supplier;
1918
import java.util.stream.Collectors;
2019

2120
public class Commands {

‎src/main/java/de/dafuqs/revelationary/RevelationDataLoader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ private RevelationDataLoader() {
2020

2121
@Override
2222
protected void apply(Map<Identifier, JsonElement> prepared, ResourceManager manager, Profiler profiler) {
23-
prepared.forEach((identifier, jsonElement) -> {
24-
RevelationRegistry.registerFromJson(jsonElement.getAsJsonObject());
25-
});
23+
prepared.forEach((identifier, jsonElement) -> RevelationRegistry.registerFromJson(jsonElement.getAsJsonObject()));
2624
}
2725

2826
@Override

‎src/main/java/de/dafuqs/revelationary/RevelationRegistry.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.minecraft.registry.*;
1515
import net.minecraft.text.MutableText;
1616
import net.minecraft.text.Text;
17+
import net.minecraft.text.TextCodecs;
1718
import net.minecraft.util.Identifier;
1819
import net.minecraft.util.JsonHelper;
1920
import net.minecraft.util.Language;
@@ -315,6 +316,14 @@ public static Map<Identifier, List<Item>> getItemEntries() {
315316
public static List<Item> getItemEntries(Identifier advancement) {
316317
return ADVANCEMENT_ITEM_REGISTRY.getOrDefault(advancement, Collections.EMPTY_LIST);
317318
}
319+
320+
private static void writeText(PacketByteBuf buf, Text text) {
321+
TextCodecs.PACKET_CODEC.encode(buf, text);
322+
}
323+
324+
private static Text readText(PacketByteBuf buf) {
325+
return TextCodecs.PACKET_CODEC.decode(buf);
326+
}
318327

319328
public static void write(PacketByteBuf buf) {
320329
// Block States
@@ -343,14 +352,14 @@ public static void write(PacketByteBuf buf) {
343352
buf.writeInt(ALTERNATE_BLOCK_TRANSLATION_STRING_REGISTRY.size());
344353
for (Map.Entry<Block, MutableText> blockTranslation : ALTERNATE_BLOCK_TRANSLATION_STRING_REGISTRY.entrySet()) {
345354
buf.writeIdentifier(Registries.BLOCK.getId(blockTranslation.getKey()));
346-
buf.writeText(blockTranslation.getValue());
355+
writeText(buf, blockTranslation.getValue());
347356
}
348357

349358
// Item Translations
350359
buf.writeInt(ALTERNATE_ITEM_TRANSLATION_STRING_REGISTRY.size());
351360
for (Map.Entry<Item, MutableText> itemTranslation : ALTERNATE_ITEM_TRANSLATION_STRING_REGISTRY.entrySet()) {
352361
buf.writeIdentifier(Registries.ITEM.getId(itemTranslation.getKey()));
353-
buf.writeText(itemTranslation.getValue());
362+
writeText(buf, itemTranslation.getValue());
354363
}
355364

356365
}
@@ -410,15 +419,15 @@ public static void fromPacket(PacketByteBuf buf) throws CommandSyntaxException {
410419
int blockTranslations = buf.readInt();
411420
for (int i = 0; i < blockTranslations; i++) {
412421
Block block = Registries.BLOCK.get(buf.readIdentifier());
413-
MutableText text = (MutableText) buf.readText();
422+
MutableText text = (MutableText) readText(buf);
414423
ALTERNATE_BLOCK_TRANSLATION_STRING_REGISTRY.put(block, text);
415424
}
416425

417426
// Item Translations
418427
int itemTranslations = buf.readInt();
419428
for (int i = 0; i < itemTranslations; i++) {
420429
Item item = Registries.ITEM.get(buf.readIdentifier());
421-
MutableText text = (MutableText) buf.readText();
430+
MutableText text = (MutableText) readText(buf);
422431
ALTERNATE_ITEM_TRANSLATION_STRING_REGISTRY.put(item, text);
423432
}
424433
}

‎src/main/java/de/dafuqs/revelationary/Revelationary.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package de.dafuqs.revelationary;
22

33
import de.dafuqs.revelationary.api.advancements.*;
4-
import de.dafuqs.revelationary.config.*;
4+
import de.dafuqs.revelationary.networking.RevelationaryPackets;
55
import net.fabricmc.api.*;
66
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
77
import net.fabricmc.fabric.api.event.lifecycle.v1.*;
8+
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
89
import net.fabricmc.fabric.api.resource.*;
910
import net.fabricmc.loader.api.*;
1011
import net.minecraft.resource.*;
11-
import net.minecraft.server.*;
1212
import org.slf4j.*;
1313

1414
public class Revelationary implements ModInitializer {
@@ -17,28 +17,28 @@ public class Revelationary implements ModInitializer {
1717
private static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
1818

1919
public static void logInfo(String message) {
20-
LOGGER.info("[Revelationary] " + message);
20+
LOGGER.info("[Revelationary] {}", message);
2121
}
2222

2323
public static void logWarning(String message) {
24-
LOGGER.warn("[Revelationary] " + message);
24+
LOGGER.warn("[Revelationary] {}", message);
2525
}
2626

2727
public static void logError(String message) {
28-
LOGGER.error("[Revelationary] " + message);
28+
LOGGER.error("[Revelationary] {}", message);
2929
}
3030

3131
@Override
3232
public void onInitialize() {
3333
logInfo("Starting Common Startup");
3434

35+
PayloadTypeRegistry.playS2C().register(RevelationaryPackets.RevelationSync.ID, RevelationaryPackets.RevelationSync.CODEC);
36+
3537
AdvancementCriteria.register();
3638
CommandRegistrationCallback.EVENT.register(Commands::register);
3739
ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(RevelationDataLoader.INSTANCE);
3840

39-
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
40-
RevelationRegistry.addRevelationAwares();
41-
});
41+
ServerLifecycleEvents.SERVER_STARTED.register(server -> RevelationRegistry.addRevelationAwares());
4242

4343
if (FabricLoader.getInstance().isModLoaded("sodium")) {
4444
logWarning("Sodium detected. Chunk rebuilding will be done in cursed mode.");

‎src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import de.dafuqs.revelationary.Revelationary;
55
import net.fabricmc.api.EnvType;
66
import net.fabricmc.api.Environment;
7-
import net.minecraft.advancement.Advancement;
87
import net.minecraft.advancement.AdvancementEntry;
98
import net.minecraft.entity.player.PlayerEntity;
109
import net.minecraft.server.network.ServerPlayerEntity;

‎src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package de.dafuqs.revelationary.api.advancements;
22

33
import de.dafuqs.revelationary.advancement_criteria.AdvancementGottenCriterion;
4-
import net.minecraft.advancement.Advancement;
54
import net.minecraft.advancement.AdvancementEntry;
65
import net.minecraft.advancement.PlayerAdvancementTracker;
76
import net.minecraft.server.ServerAdvancementLoader;
87
import net.minecraft.server.network.ServerPlayerEntity;
9-
108
import java.util.function.BiConsumer;
119

1210
public class AdvancementUtils {

‎src/main/java/de/dafuqs/revelationary/api/revelations/RevelationAware.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import net.minecraft.entity.Entity;
1010
import net.minecraft.entity.player.PlayerEntity;
1111
import net.minecraft.item.Item;
12-
import net.minecraft.loot.context.LootContext;
1312
import net.minecraft.loot.context.LootContextParameterSet;
1413
import net.minecraft.loot.context.LootContextParameters;
1514
import net.minecraft.text.MutableText;

‎src/main/java/de/dafuqs/revelationary/mixin/AbstractBlockMixin.java

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,33 @@
22

33
import de.dafuqs.revelationary.*;
44
import de.dafuqs.revelationary.api.revelations.RevelationAware;
5-
import de.dafuqs.revelationary.config.RevelationaryConfig;
65
import net.minecraft.block.*;
76
import net.minecraft.entity.player.PlayerEntity;
8-
import net.minecraft.item.ItemStack;
9-
import net.minecraft.loot.context.LootContext;
7+
import net.minecraft.loot.LootTable;
108
import net.minecraft.loot.context.LootContextParameterSet;
11-
import net.minecraft.registry.Registries;
12-
import net.minecraft.util.Identifier;
13-
import net.minecraft.util.math.*;
14-
import net.minecraft.world.*;
9+
import net.minecraft.registry.RegistryKey;
1510
import org.spongepowered.asm.mixin.Mixin;
1611
import org.spongepowered.asm.mixin.Shadow;
1712
import org.spongepowered.asm.mixin.injection.*;
18-
import org.spongepowered.asm.mixin.injection.callback.*;
19-
20-
import java.util.List;
2113

2214
@Mixin(AbstractBlock.class)
2315
public abstract class AbstractBlockMixin {
24-
25-
@Shadow
26-
public abstract Identifier getLootTableId();
16+
17+
@Shadow public abstract RegistryKey<LootTable> getLootTableKey();
2718

2819
@Redirect(
2920
method = "getDroppedStacks(Lnet/minecraft/block/BlockState;Lnet/minecraft/loot/context/LootContextParameterSet$Builder;)Ljava/util/List;",
30-
at = @At(value = "INVOKE", target = "Lnet/minecraft/block/AbstractBlock;getLootTableId()Lnet/minecraft/util/Identifier;")
21+
at = @At(value = "INVOKE", target = "Lnet/minecraft/block/AbstractBlock;getLootTableKey()Lnet/minecraft/registry/RegistryKey;")
3122
)
32-
private Identifier spectrum$switchLootTableForCloakedBlock(AbstractBlock instance, BlockState state, LootContextParameterSet.Builder builder) {
23+
private RegistryKey<LootTable> spectrum$switchLootTableForCloakedBlock(AbstractBlock instance, BlockState state, LootContextParameterSet.Builder builder) {
3324
BlockState cloakState = RevelationRegistry.getCloak(state);
3425
if (cloakState != null) {
3526
PlayerEntity lootPlayerEntity = RevelationAware.getLootPlayerEntity(builder);
3627
if (!RevelationRegistry.isVisibleTo(state, lootPlayerEntity)) {
37-
return cloakState.getBlock().getLootTableId();
28+
return cloakState.getBlock().getLootTableKey();
3829
}
3930
}
40-
return getLootTableId();
31+
return getLootTableKey();
4132
}
4233

4334
}

‎src/main/java/de/dafuqs/revelationary/mixin/BlockUnbreakingMixin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package de.dafuqs.revelationary.mixin;
22

33
import de.dafuqs.revelationary.*;
4-
import de.dafuqs.revelationary.api.revelations.*;
54
import net.minecraft.block.*;
65
import net.minecraft.entity.player.*;
7-
import net.minecraft.loot.context.*;
8-
import net.minecraft.util.*;
96
import net.minecraft.util.math.*;
107
import net.minecraft.world.*;
118
import org.spongepowered.asm.mixin.*;

‎src/main/java/de/dafuqs/revelationary/mixin/PlayerAdvancementTrackerMixin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import de.dafuqs.revelationary.RevelationRegistry;
44
import de.dafuqs.revelationary.api.advancements.AdvancementCriteria;
5-
import net.minecraft.advancement.Advancement;
65
import net.minecraft.advancement.AdvancementEntry;
76
import net.minecraft.advancement.AdvancementProgress;
87
import net.minecraft.advancement.PlayerAdvancementTracker;

‎src/main/java/de/dafuqs/revelationary/mixin/Plugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.dafuqs.revelationary.mixin;
22

33
import de.dafuqs.revelationary.config.*;
4-
import net.fabricmc.loader.api.*;
54
import org.objectweb.asm.tree.*;
65
import org.spongepowered.asm.mixin.extensibility.*;
76

‎src/main/java/de/dafuqs/revelationary/mixin/client/AccessorClientAdvancementManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.dafuqs.revelationary.mixin.client;
22

3-
import net.minecraft.advancement.Advancement;
3+
import net.minecraft.advancement.AdvancementEntry;
44
import net.minecraft.advancement.AdvancementProgress;
55
import net.minecraft.client.network.ClientAdvancementManager;
66
import org.spongepowered.asm.mixin.Mixin;
@@ -12,6 +12,6 @@
1212
public interface AccessorClientAdvancementManager {
1313

1414
@Accessor
15-
Map<Advancement, AdvancementProgress> getAdvancementProgresses();
15+
Map<AdvancementEntry, AdvancementProgress> getAdvancementProgresses();
1616

1717
}

‎src/main/java/de/dafuqs/revelationary/mixin/client/ItemModelsMixin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package de.dafuqs.revelationary.mixin.client;
22

33
import de.dafuqs.revelationary.ClientRevelationHolder;
4-
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
54
import net.minecraft.client.render.item.ItemModels;
65
import net.minecraft.client.render.model.BakedModel;
7-
import net.minecraft.client.render.model.BakedModelManager;
86
import net.minecraft.item.Item;
97
import net.minecraft.item.ItemStack;
10-
import org.spongepowered.asm.mixin.Final;
118
import org.spongepowered.asm.mixin.Mixin;
129
import org.spongepowered.asm.mixin.Shadow;
1310
import org.spongepowered.asm.mixin.injection.At;

0 commit comments

Comments
 (0)