From 0597beaa02e9099fff935d1eca94ec40041ca426 Mon Sep 17 00:00:00 2001 From: qouteall Date: Sat, 22 Jul 2023 16:08:25 +0800 Subject: [PATCH] Fix license. Rename mixin. --- ...xinSchema2832.java => Schema2832Mixin.java} | 18 +++++++++++++++++- ...aggedChoice.java => TaggedChoiceMixin.java} | 18 +++++++++++++++++- ...iceType.java => TaggedChoiceTypeMixin.java} | 18 +++++++++++++++++- .../resources/fabric-dimensions-v1.mixins.json | 8 ++++---- 4 files changed, 55 insertions(+), 7 deletions(-) rename fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/{MixinSchema2832.java => Schema2832Mixin.java} (67%) rename fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/{MixinTaggedChoice.java => TaggedChoiceMixin.java} (64%) rename fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/{MixinTaggedChoiceType.java => TaggedChoiceTypeMixin.java} (73%) diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinSchema2832.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/Schema2832Mixin.java similarity index 67% rename from fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinSchema2832.java rename to fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/Schema2832Mixin.java index 543b676376..e53d5b7818 100644 --- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinSchema2832.java +++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/Schema2832Mixin.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package net.fabricmc.fabric.mixin.dimension; import java.util.Map; @@ -16,7 +32,7 @@ import net.fabricmc.fabric.impl.dimension.TaggedChoiceExtension; @Mixin(value = Schema2832.class, remap = false) -public class MixinSchema2832 { +public class Schema2832Mixin { /** * Make the DSL.taggedChoiceLazy to ignore mod custom generator types and not cause deserialization failure. */ diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoice.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java similarity index 64% rename from fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoice.java rename to fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java index 4d33463edc..e1da627b68 100644 --- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoice.java +++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package net.fabricmc.fabric.mixin.dimension; import com.mojang.datafixers.types.Type; @@ -13,7 +29,7 @@ import net.fabricmc.fabric.impl.dimension.TaggedChoiceTypeExtension; @Mixin(value = TaggedChoice.class, remap = false) -public class MixinTaggedChoice implements TaggedChoiceExtension { +public class TaggedChoiceMixin implements TaggedChoiceExtension { @Unique boolean failSoft = false; diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoiceType.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTypeMixin.java similarity index 73% rename from fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoiceType.java rename to fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTypeMixin.java index d777166e08..f0339e408e 100644 --- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinTaggedChoiceType.java +++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTypeMixin.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package net.fabricmc.fabric.mixin.dimension; import com.mojang.datafixers.types.Type; @@ -18,7 +34,7 @@ import net.fabricmc.fabric.impl.dimension.TaggedChoiceTypeExtension; @Mixin(value = TaggedChoice.TaggedChoiceType.class, remap = false) -public class MixinTaggedChoiceType implements TaggedChoiceTypeExtension { +public class TaggedChoiceTypeMixin implements TaggedChoiceTypeExtension { @Unique private static final Logger LOGGER = LoggerFactory.getLogger("TaggedChoiceType_DimDataFix"); diff --git a/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json b/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json index 169b24c4ba..74f20a425f 100644 --- a/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json +++ b/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json @@ -4,10 +4,10 @@ "compatibilityLevel": "JAVA_16", "mixins": [ "EntityMixin", - "MixinSchema2832", - "MixinTaggedChoice", - "MixinTaggedChoiceType", - "RegistryCodecsMixin" + "RegistryCodecsMixin", + "Schema2832Mixin", + "TaggedChoiceMixin", + "TaggedChoiceTypeMixin" ], "injectors": { "defaultRequire": 1