From 6117b11483cf2b3f090549d405d7eb5ac32bab02 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 23 Dec 2020 16:57:32 +0800 Subject: [PATCH] Fix license, remove unused mixin --- build.gradle | 2 +- .../hooks/biome/SpawnProperties.java | 19 +++++++++++++++++++ .../hooks/forge/FluidStackHooksForge.java | 19 +++++++++++++++++++ ...iomeGenerationSettingsBuilderAccessor.java | 19 +++++++++++++++++++ .../forge/BiomeSpecialEffectsAccessor.java | 8 -------- .../MobSpawnSettingsBuilderAccessor.java | 19 +++++++++++++++++++ .../forge/BiomeModificationsImpl.java | 19 +++++++++++++++++++ .../main/resources/architectury.mixins.json | 2 +- 8 files changed, 97 insertions(+), 10 deletions(-) delete mode 100644 forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeSpecialEffectsAccessor.java diff --git a/build.gradle b/build.gradle index 080fc22e..5bd420ba 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { year = 2020 } - include "*.java" + include "**/*.java" exclude "**/NbtType.java" ignoreFailures = true diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/biome/SpawnProperties.java b/common/src/main/java/me/shedaniel/architectury/hooks/biome/SpawnProperties.java index 43e8b182..cc406729 100644 --- a/common/src/main/java/me/shedaniel/architectury/hooks/biome/SpawnProperties.java +++ b/common/src/main/java/me/shedaniel/architectury/hooks/biome/SpawnProperties.java @@ -1,3 +1,22 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020 shedaniel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + package me.shedaniel.architectury.hooks.biome; import net.minecraft.world.entity.EntityType; diff --git a/forge/src/main/java/me/shedaniel/architectury/hooks/forge/FluidStackHooksForge.java b/forge/src/main/java/me/shedaniel/architectury/hooks/forge/FluidStackHooksForge.java index 17c13476..6f1763e7 100644 --- a/forge/src/main/java/me/shedaniel/architectury/hooks/forge/FluidStackHooksForge.java +++ b/forge/src/main/java/me/shedaniel/architectury/hooks/forge/FluidStackHooksForge.java @@ -1,3 +1,22 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020 shedaniel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + package me.shedaniel.architectury.hooks.forge; import me.shedaniel.architectury.fluid.FluidStack; diff --git a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeGenerationSettingsBuilderAccessor.java b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeGenerationSettingsBuilderAccessor.java index 140cd5e5..6c4f52d8 100644 --- a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeGenerationSettingsBuilderAccessor.java +++ b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeGenerationSettingsBuilderAccessor.java @@ -1,3 +1,22 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020 shedaniel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + package me.shedaniel.architectury.mixin.forge; import net.minecraft.world.level.biome.BiomeGenerationSettings; diff --git a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeSpecialEffectsAccessor.java b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeSpecialEffectsAccessor.java deleted file mode 100644 index 70a79f78..00000000 --- a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/BiomeSpecialEffectsAccessor.java +++ /dev/null @@ -1,8 +0,0 @@ -package me.shedaniel.architectury.mixin.forge; - -import net.minecraft.world.level.biome.BiomeSpecialEffects; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(BiomeSpecialEffects.class) -public interface BiomeSpecialEffectsAccessor { -} diff --git a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MobSpawnSettingsBuilderAccessor.java b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MobSpawnSettingsBuilderAccessor.java index bc20e53c..b1e65969 100644 --- a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MobSpawnSettingsBuilderAccessor.java +++ b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MobSpawnSettingsBuilderAccessor.java @@ -1,3 +1,22 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020 shedaniel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + package me.shedaniel.architectury.mixin.forge; import net.minecraft.world.entity.EntityType; diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/BiomeModificationsImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/BiomeModificationsImpl.java index 5004dd76..03b2bada 100644 --- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/BiomeModificationsImpl.java +++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/BiomeModificationsImpl.java @@ -1,3 +1,22 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020 shedaniel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + package me.shedaniel.architectury.registry.forge; import com.google.common.collect.Lists; diff --git a/forge/src/main/resources/architectury.mixins.json b/forge/src/main/resources/architectury.mixins.json index 87d3e02a..c3391c94 100644 --- a/forge/src/main/resources/architectury.mixins.json +++ b/forge/src/main/resources/architectury.mixins.json @@ -5,7 +5,7 @@ "minVersion": "0.8", "client": [ ], - "mixins": ["BiomeGenerationSettingsBuilderAccessor", "BiomeSpecialEffectsAccessor", "MobSpawnSettingsBuilderAccessor"], + "mixins": ["BiomeGenerationSettingsBuilderAccessor", "MobSpawnSettingsBuilderAccessor"], "injectors": { "defaultRequire": 1 }