Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spawn egg data fixer

Browse Source
This commit is contained in:
nea
2023-05-30 18:33:57 +02:00
parent 6b124ec9af
commit 2ff8c59c74
2 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/moe/nea/firmament/mixins/MixinEntityIdFix.java
View File

@@ -1,4 +1,32 @@
package moe.nea.firmament.mixins; package moe.nea.firmament.mixins;
public class MixinEntityIdFix { import com.mojang.datafixers.DataFix;
import com.mojang.datafixers.TypeRewriteRule;
import com.mojang.datafixers.schemas.Schema;
import com.mojang.datafixers.util.Pair;
import net.minecraft.datafixer.TypeReferences;
import net.minecraft.datafixer.fix.EntityIdFix;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Map;
@Mixin(EntityIdFix.class)
public abstract class MixinEntityIdFix extends DataFix {
@Shadow
@Final
private static Map<String, String> RENAMED_ENTITIES;
public MixinEntityIdFix(Schema outputSchema, boolean changesType) {
super(outputSchema, changesType);
}
@Inject(method = "makeRule", at = @At("RETURN"), cancellable = true)
public void onMakeRule(CallbackInfoReturnable<TypeRewriteRule> cir) {
cir.setReturnValue(TypeRewriteRule.seq(fixTypeEverywhere("EntityIdFix", getInputSchema().findChoiceType(TypeReferences.ENTITY), getOutputSchema().findChoiceType(TypeReferences.ENTITY), dynamicOps -> pair -> ((Pair) pair).mapFirst(string -> RENAMED_ENTITIES.getOrDefault(string, (String) string))), convertUnchecked("Fix Type", getInputSchema().getType(TypeReferences.ITEM_STACK), getOutputSchema().getType(TypeReferences.ITEM_STACK))));
}
} }

45
src/main/resources/firmament.mixins.json
View File

@@ -1,25 +1,26 @@
{ {
"required": true, "required": true,
"plugin": "moe.nea.firmament.init.MixinPlugin", "plugin": "moe.nea.firmament.init.MixinPlugin",
"package": "moe.nea.firmament.mixins", "package": "moe.nea.firmament.mixins",
"compatibilityLevel": "JAVA_16", "compatibilityLevel": "JAVA_16",
"client": [ "client": [
"MixinDownloadingTerrainScreen", "MixinDownloadingTerrainScreen",
"MixinMessageHandler", "MixinMessageHandler",
"MixinMinecraft", "MixinMinecraft",
"MixinWorldRenderer", "MixinWorldRenderer",
"accessor.AccessorHandledScreen", "accessor.AccessorHandledScreen",
"devenv.DisableCommonPacketWarnings" "devenv.DisableCommonPacketWarnings"
], ],
"mixins": [ "mixins": [
"MixinClientPacketHandler", "MixinClientPacketHandler",
"MixinClientPlayerEntity", "MixinClientPlayerEntity",
"MixinHandledScreen", "MixinEntityIdFix",
"MixinPlayerInventory", "MixinHandledScreen",
"devenv.DisableInvalidFishingHook", "MixinPlayerInventory",
"devenv.MixinScoreboard" "devenv.DisableInvalidFishingHook",
], "devenv.MixinScoreboard"
"injectors": { ],
"defaultRequire": 1 "injectors": {
"defaultRequire": 1
} }
} }