From 8bcd45bdfd68a9317698805aad13ee1be7d158fa Mon Sep 17 00:00:00 2001 From: Yuqi154 <1123489751@qq.com> Date: Tue, 30 Apr 2024 23:13:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=BB=A5=E5=8C=B9=E9=85=8D=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=82=202.=20=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gensokyo/nucleardelight/world/item/Items.java | 4 ---- .../hiedacamellia/nuclearelysian}/Config.java | 3 +-- .../hiedacamellia/nuclearelysian}/NuclearDelight.java | 10 +++++----- .../hiedacamellia/nuclearelysian}/Utils.java | 6 +++--- .../nuclearelysian}/datagenerator/DataGenerator.java | 4 ++-- .../nuclearelysian}/datagenerator/Lang.java | 2 +- .../nuclearelysian}/datagenerator/LangGenerator.java | 4 ++-- .../nuclearelysian}/datagenerator/LangName.java | 2 +- .../nuclearelysian}/datagenerator/Langs.java | 2 +- .../datagenerator/SingleTextureItemModelGenerator.java | 4 ++-- .../nuclearelysian}/register/AutoRegistryObject.java | 2 +- .../nuclearelysian}/world/effect/MobEffects.java | 4 ++-- .../world/effect/VomitingMobEffect.java | 4 ++-- .../nuclearelysian}/world/food/Foods.java | 10 +++++----- .../hiedacamellia/nuclearelysian/world/item/Items.java | 4 ++++ 15 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/com/gensokyo/nucleardelight/world/item/Items.java rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/Config.java (97%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/NuclearDelight.java (96%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/Utils.java (94%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/DataGenerator.java (90%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/Lang.java (77%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/LangGenerator.java (81%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/LangName.java (79%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/Langs.java (83%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/datagenerator/SingleTextureItemModelGenerator.java (91%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/register/AutoRegistryObject.java (91%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/world/effect/MobEffects.java (60%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/world/effect/VomitingMobEffect.java (79%) rename src/main/java/{com/gensokyo/nucleardelight => org/hiedacamellia/nuclearelysian}/world/food/Foods.java (77%) create mode 100644 src/main/java/org/hiedacamellia/nuclearelysian/world/item/Items.java diff --git a/src/main/java/com/gensokyo/nucleardelight/world/item/Items.java b/src/main/java/com/gensokyo/nucleardelight/world/item/Items.java deleted file mode 100644 index 40ea162..0000000 --- a/src/main/java/com/gensokyo/nucleardelight/world/item/Items.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.gensokyo.nucleardelight.world.item; - -public class Items { -} diff --git a/src/main/java/com/gensokyo/nucleardelight/Config.java b/src/main/java/org/hiedacamellia/nuclearelysian/Config.java similarity index 97% rename from src/main/java/com/gensokyo/nucleardelight/Config.java rename to src/main/java/org/hiedacamellia/nuclearelysian/Config.java index 8c60e57..a0922e5 100644 --- a/src/main/java/com/gensokyo/nucleardelight/Config.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/Config.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight; +package org.hiedacamellia.nuclearelysian; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; @@ -8,7 +8,6 @@ import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.registries.ForgeRegistries; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/gensokyo/nucleardelight/NuclearDelight.java b/src/main/java/org/hiedacamellia/nuclearelysian/NuclearDelight.java similarity index 96% rename from src/main/java/com/gensokyo/nucleardelight/NuclearDelight.java rename to src/main/java/org/hiedacamellia/nuclearelysian/NuclearDelight.java index 556f7f4..0c4bb5b 100644 --- a/src/main/java/com/gensokyo/nucleardelight/NuclearDelight.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/NuclearDelight.java @@ -1,9 +1,9 @@ -package com.gensokyo.nucleardelight; +package org.hiedacamellia.nuclearelysian; -import com.gensokyo.nucleardelight.datagenerator.LangName; -import com.gensokyo.nucleardelight.register.AutoRegistryObject; -import com.gensokyo.nucleardelight.world.effect.MobEffects; -import com.gensokyo.nucleardelight.world.food.Foods; +import org.hiedacamellia.nuclearelysian.datagenerator.LangName; +import org.hiedacamellia.nuclearelysian.register.AutoRegistryObject; +import org.hiedacamellia.nuclearelysian.world.effect.MobEffects; +import org.hiedacamellia.nuclearelysian.world.food.Foods; import com.mojang.logging.LogUtils; import net.minecraft.client.Minecraft; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gensokyo/nucleardelight/Utils.java b/src/main/java/org/hiedacamellia/nuclearelysian/Utils.java similarity index 94% rename from src/main/java/com/gensokyo/nucleardelight/Utils.java rename to src/main/java/org/hiedacamellia/nuclearelysian/Utils.java index 6323e01..fe4d2a6 100644 --- a/src/main/java/com/gensokyo/nucleardelight/Utils.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/Utils.java @@ -1,7 +1,7 @@ -package com.gensokyo.nucleardelight; +package org.hiedacamellia.nuclearelysian; -import com.gensokyo.nucleardelight.datagenerator.LangName; -import com.gensokyo.nucleardelight.datagenerator.Langs; +import org.hiedacamellia.nuclearelysian.datagenerator.LangName; +import org.hiedacamellia.nuclearelysian.datagenerator.Langs; import com.mojang.logging.LogUtils; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/DataGenerator.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/DataGenerator.java similarity index 90% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/DataGenerator.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/DataGenerator.java index dfff736..5d3fdbc 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/DataGenerator.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/DataGenerator.java @@ -1,6 +1,6 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; -import com.gensokyo.nucleardelight.NuclearDelight; +import org.hiedacamellia.nuclearelysian.NuclearDelight; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Item; import net.minecraftforge.common.data.ExistingFileHelper; diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/Lang.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Lang.java similarity index 77% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/Lang.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Lang.java index 8ae2416..47f3d52 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/Lang.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Lang.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; import java.lang.annotation.*; diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/LangGenerator.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangGenerator.java similarity index 81% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/LangGenerator.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangGenerator.java index 57ef9f7..8437683 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/LangGenerator.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangGenerator.java @@ -1,6 +1,6 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; -import com.gensokyo.nucleardelight.NuclearDelight; +import org.hiedacamellia.nuclearelysian.NuclearDelight; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.LanguageProvider; diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/LangName.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangName.java similarity index 79% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/LangName.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangName.java index 72d1455..0387e5e 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/LangName.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/LangName.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; public enum LangName { EN_US("en_us"), diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/Langs.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Langs.java similarity index 83% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/Langs.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Langs.java index 99a0d7d..75d5159 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/Langs.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/Langs.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/gensokyo/nucleardelight/datagenerator/SingleTextureItemModelGenerator.java b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/SingleTextureItemModelGenerator.java similarity index 91% rename from src/main/java/com/gensokyo/nucleardelight/datagenerator/SingleTextureItemModelGenerator.java rename to src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/SingleTextureItemModelGenerator.java index 33768ca..d1f94b9 100644 --- a/src/main/java/com/gensokyo/nucleardelight/datagenerator/SingleTextureItemModelGenerator.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/datagenerator/SingleTextureItemModelGenerator.java @@ -1,6 +1,6 @@ -package com.gensokyo.nucleardelight.datagenerator; +package org.hiedacamellia.nuclearelysian.datagenerator; -import com.gensokyo.nucleardelight.NuclearDelight; +import org.hiedacamellia.nuclearelysian.NuclearDelight; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gensokyo/nucleardelight/register/AutoRegistryObject.java b/src/main/java/org/hiedacamellia/nuclearelysian/register/AutoRegistryObject.java similarity index 91% rename from src/main/java/com/gensokyo/nucleardelight/register/AutoRegistryObject.java rename to src/main/java/org/hiedacamellia/nuclearelysian/register/AutoRegistryObject.java index 0ec3ccc..52928ac 100644 --- a/src/main/java/com/gensokyo/nucleardelight/register/AutoRegistryObject.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/register/AutoRegistryObject.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight.register; +package org.hiedacamellia.nuclearelysian.register; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/com/gensokyo/nucleardelight/world/effect/MobEffects.java b/src/main/java/org/hiedacamellia/nuclearelysian/world/effect/MobEffects.java similarity index 60% rename from src/main/java/com/gensokyo/nucleardelight/world/effect/MobEffects.java rename to src/main/java/org/hiedacamellia/nuclearelysian/world/effect/MobEffects.java index 1477bc7..bbfe76e 100644 --- a/src/main/java/com/gensokyo/nucleardelight/world/effect/MobEffects.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/world/effect/MobEffects.java @@ -1,6 +1,6 @@ -package com.gensokyo.nucleardelight.world.effect; +package org.hiedacamellia.nuclearelysian.world.effect; -import com.gensokyo.nucleardelight.register.AutoRegistryObject; +import org.hiedacamellia.nuclearelysian.register.AutoRegistryObject; import net.minecraft.world.effect.MobEffect; public class MobEffects { diff --git a/src/main/java/com/gensokyo/nucleardelight/world/effect/VomitingMobEffect.java b/src/main/java/org/hiedacamellia/nuclearelysian/world/effect/VomitingMobEffect.java similarity index 79% rename from src/main/java/com/gensokyo/nucleardelight/world/effect/VomitingMobEffect.java rename to src/main/java/org/hiedacamellia/nuclearelysian/world/effect/VomitingMobEffect.java index 5913694..7fa9eb6 100644 --- a/src/main/java/com/gensokyo/nucleardelight/world/effect/VomitingMobEffect.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/world/effect/VomitingMobEffect.java @@ -1,4 +1,4 @@ -package com.gensokyo.nucleardelight.world.effect; +package org.hiedacamellia.nuclearelysian.world.effect; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -19,7 +19,7 @@ protected VomitingMobEffect() { public void applyEffectTick(@NotNull LivingEntity entity, int level) { if (!entity.hasEffect(MobEffects.CONFUSION)) { entity.addEffect(new MobEffectInstance(MobEffects.CONFUSION, - Objects.requireNonNull(entity.getEffect(com.gensokyo.nucleardelight.world.effect.MobEffects.VOMITING.get())).getDuration(), 1)); + Objects.requireNonNull(entity.getEffect(org.hiedacamellia.nuclearelysian.world.effect.MobEffects.VOMITING.get())).getDuration(), 1)); } } diff --git a/src/main/java/com/gensokyo/nucleardelight/world/food/Foods.java b/src/main/java/org/hiedacamellia/nuclearelysian/world/food/Foods.java similarity index 77% rename from src/main/java/com/gensokyo/nucleardelight/world/food/Foods.java rename to src/main/java/org/hiedacamellia/nuclearelysian/world/food/Foods.java index 044908a..668223d 100644 --- a/src/main/java/com/gensokyo/nucleardelight/world/food/Foods.java +++ b/src/main/java/org/hiedacamellia/nuclearelysian/world/food/Foods.java @@ -1,9 +1,9 @@ -package com.gensokyo.nucleardelight.world.food; +package org.hiedacamellia.nuclearelysian.world.food; -import com.gensokyo.nucleardelight.datagenerator.Lang; -import com.gensokyo.nucleardelight.datagenerator.LangName; -import com.gensokyo.nucleardelight.datagenerator.Langs; -import com.gensokyo.nucleardelight.world.effect.MobEffects; +import org.hiedacamellia.nuclearelysian.datagenerator.Lang; +import org.hiedacamellia.nuclearelysian.datagenerator.LangName; +import org.hiedacamellia.nuclearelysian.datagenerator.Langs; +import org.hiedacamellia.nuclearelysian.world.effect.MobEffects; import com.mojang.logging.LogUtils; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.food.FoodProperties; diff --git a/src/main/java/org/hiedacamellia/nuclearelysian/world/item/Items.java b/src/main/java/org/hiedacamellia/nuclearelysian/world/item/Items.java new file mode 100644 index 0000000..0d429db --- /dev/null +++ b/src/main/java/org/hiedacamellia/nuclearelysian/world/item/Items.java @@ -0,0 +1,4 @@ +package org.hiedacamellia.nuclearelysian.world.item; + +public class Items { +}