Skip to content

Commit 1c3b352

Browse files
DaFuqsDaFuqs
authored
Merge pull request #15 from imreallybadatnames/1.20.4
update broken accessor mixin + other changes
2 parents 292002d + 14d2887 commit 1c3b352

16 files changed

+17
-49
lines changed

‎examples/example_revelations.json

Lines changed: 3 additions & 3 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
}
21-
}
21+
}

‎examples/revelationary_demo_datapack.zip

2 Bytes
Binary file not shown.

‎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: 5 additions & 9 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,22 +88,18 @@ 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();
9896
if (blockItem != null) {
99-
if (!activeItemSwaps.contains(blockItem)) {
100-
activeItemSwaps.add(blockItem);
101-
}
97+
activeItemSwaps.add(blockItem);
10298
}
10399
}
104100
rebuildAllChunks();
105101
}
106-
102+
107103
activeItemSwaps.addAll(concealedItems);
108104

109105
for (Block concealedBlock : concealedBlocks) {

‎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/Revelationary.java

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

33
import de.dafuqs.revelationary.api.advancements.*;
4-
import de.dafuqs.revelationary.config.*;
54
import net.fabricmc.api.*;
65
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
76
import net.fabricmc.fabric.api.event.lifecycle.v1.*;
87
import net.fabricmc.fabric.api.resource.*;
98
import net.fabricmc.loader.api.*;
109
import net.minecraft.resource.*;
11-
import net.minecraft.server.*;
1210
import org.slf4j.*;
1311

1412
public class Revelationary implements ModInitializer {
@@ -17,15 +15,15 @@ public class Revelationary implements ModInitializer {
1715
private static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
1816

1917
public static void logInfo(String message) {
20-
LOGGER.info("[Revelationary] " + message);
18+
LOGGER.info("[Revelationary] {}", message);
2119
}
2220

2321
public static void logWarning(String message) {
24-
LOGGER.warn("[Revelationary] " + message);
22+
LOGGER.warn("[Revelationary] {}", message);
2523
}
2624

2725
public static void logError(String message) {
28-
LOGGER.error("[Revelationary] " + message);
26+
LOGGER.error("[Revelationary] {}", message);
2927
}
3028

3129
@Override
@@ -36,9 +34,7 @@ public void onInitialize() {
3634
CommandRegistrationCallback.EVENT.register(Commands::register);
3735
ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(RevelationDataLoader.INSTANCE);
3836

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

4339
if (FabricLoader.getInstance().isModLoaded("sodium")) {
4440
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
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;

‎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: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@
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;
107
import net.minecraft.loot.context.LootContextParameterSet;
11-
import net.minecraft.registry.Registries;
128
import net.minecraft.util.Identifier;
13-
import net.minecraft.util.math.*;
14-
import net.minecraft.world.*;
159
import org.spongepowered.asm.mixin.Mixin;
1610
import org.spongepowered.asm.mixin.Shadow;
1711
import org.spongepowered.asm.mixin.injection.*;
18-
import org.spongepowered.asm.mixin.injection.callback.*;
19-
20-
import java.util.List;
2112

2213
@Mixin(AbstractBlock.class)
2314
public abstract class AbstractBlockMixin {

‎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)