From 97b81acee7ae09cf100bb96e81dbaf5f6bb8e4a2 Mon Sep 17 00:00:00 2001 From: ictye Date: Sun, 28 Apr 2024 22:51:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=9B=B6=E5=88=BB?= =?UTF-8?q?=E9=AD=94=E6=B3=95=E5=92=8C=E9=AD=94=E6=B3=95=E7=90=83=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E8=BF=99=E4=B8=AA=E9=AD=94=E6=B3=95=E7=90=83?= =?UTF-8?q?=E6=9C=AA=E5=85=8D=E6=9C=89=E7=82=B9=E5=A4=AA=E5=BC=B9=E4=BA=86?= =?UTF-8?q?=EF=BC=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../89b86ab0e66f527166d98df92ddbcf5416ed58f6 | 4 +- .../dc1d6e7286e7569a79007c10f809d49635ea1c49 | 2 +- .../f3798f81c7b6fecad2cbfec741314f8a66c0eca3 | 4 +- .../the_origin_of_magic/lang/en_us.json | 2 + .../models/item/null_magic.json | 6 ++ .../Contents/AllEntity.java | 17 +++++- .../the_origin_of_magic/Contents/AllItem.java | 44 ++++++++++++--- .../Magics/CorrectionMagic/NullMagic.java | 10 ++++ .../StdMagic}/StdDriestEffectMagic.java | 2 +- .../StdMagic}/StdThrownMagic.java | 28 ++++------ .../{ => StdMagic}/ExplosionThrownMagic.java | 19 ++----- .../Magics/{ => StdMagic}/MagicBullet.java | 5 +- .../MagicBulletWithTimeTrigger.java | 5 +- .../MagicBulletWithTrigger.java | 3 +- .../Magics/StdMagic/MagicEnergyThrowBoll.java | 52 ++++++++++++++++++ .../{ => StdMagic}/PoisonThrownMagic.java | 5 +- .../Magics/{ => StdMagic}/RayMagic.java | 5 +- .../MagicLIfeTimeDownItem.java | 4 +- .../CorrectionMagic/MagicLifeTimeUpItem.java | 4 +- .../Magic/CorrectionMagic/NullMagicItem.java | 21 +++++++ .../Magic/EffectMagicItem/StdEffectItem.java | 4 +- .../Magic/{ => Interface}/StdMagicItem.java | 4 +- .../Magic/LimiterItem/StdLimiterItem.java | 4 +- .../LimiterItem/UndeadEntityLimiterItem.java | 2 +- .../ExplosionMagicEntityItem.java | 7 ++- .../Magic/{ => StdMagic}/MagicBulletItem.java | 9 +-- .../MagicBulletWithTimeTriggerItem.java | 9 +-- .../MagicBulletWithTriggerItem.java | 9 +-- .../StdMagic/MagicEnergyThrowBollItem.java | 22 ++++++++ .../{ => StdMagic}/PoisonMagicEntityItem.java | 9 +-- .../Magic/{ => StdMagic}/RayMagicItem.java | 9 +-- .../foundation/Items/Staff/StdStaff.java | 6 +- .../MagicAbilitiesManager.java | 6 +- .../mixin/PlayerEntity/ServerEntityMixin.java | 2 +- .../{netWork => NetWork}/NetWorkReg.java | 2 +- .../{netWork => NetWork}/NetworkIDFinder.java | 2 +- .../SyncHUDS2CPacket.java | 2 +- .../Renders/MagicsRender/MagicRender.java | 2 +- .../the_origin_of_magic.java | 2 +- .../the_origin_of_magic_client.java | 2 +- .../utils/MagicInventory.java | 2 +- .../item/magic_bullet_with_trigger.png | Bin 298 -> 297 bytes 42 files changed, 254 insertions(+), 104 deletions(-) create mode 100644 src/main/generated/assets/the_origin_of_magic/models/item/null_magic.json create mode 100644 src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/NullMagic.java rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => MagicInterfaces/StdMagic}/StdDriestEffectMagic.java (91%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => MagicInterfaces/StdMagic}/StdThrownMagic.java (95%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/ExplosionThrownMagic.java (82%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/MagicBullet.java (89%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/MagicBulletWithTimeTrigger.java (90%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/MagicBulletWithTrigger.java (92%) create mode 100644 src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicEnergyThrowBoll.java rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/PoisonThrownMagic.java (85%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/{ => StdMagic}/RayMagic.java (96%) create mode 100644 src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/NullMagicItem.java rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => Interface}/StdMagicItem.java (84%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/ExplosionMagicEntityItem.java (79%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/MagicBulletItem.java (74%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/MagicBulletWithTimeTriggerItem.java (78%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/MagicBulletWithTriggerItem.java (73%) create mode 100644 src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicEnergyThrowBollItem.java rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/PoisonMagicEntityItem.java (69%) rename src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/{ => StdMagic}/RayMagicItem.java (83%) rename src/main/java/com/ictye/the_origin_of_magic/infrastructure/{netWork => NetWork}/NetWorkReg.java (90%) rename src/main/java/com/ictye/the_origin_of_magic/infrastructure/{netWork => NetWork}/NetworkIDFinder.java (79%) rename src/main/java/com/ictye/the_origin_of_magic/infrastructure/{netWork => NetWork}/SyncHUDS2CPacket.java (94%) diff --git a/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 b/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 index ccfd2e8..cff0dc4 100644 --- a/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 +++ b/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 @@ -1,2 +1,2 @@ -// 1.19.2 2024-04-27T21:43:20.5506987 Language -e20b0ea5b300d1f01ca66c6725d1e0c00be855ef assets\the_origin_of_magic\lang\en_us.json +// 1.19.2 2024-04-28T22:48:00.5462027 Language +60fc1c17293eabeb679d8e91fb8244d3101fa2ec assets\the_origin_of_magic\lang\en_us.json diff --git a/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 b/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 index 69c054a..e0fad7e 100644 --- a/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 +++ b/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 @@ -1,2 +1,2 @@ -// 1.19.2 2024-04-27T21:43:20.5476236 Block Loot Tables +// 1.19.2 2024-04-28T22:48:00.5402056 Block Loot Tables fe57f13449a11436bbede8c37e01bd0d1cd87191 data\the_origin_of_magic\loot_tables\blocks\magic_workbench.json diff --git a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 index 881ae54..7d3c585 100644 --- a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 +++ b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 @@ -1,5 +1,6 @@ -// 1.19.2 2024-04-27T21:43:20.5441261 Models +// 1.19.2 2024-04-28T22:48:00.5427039 Models e61b535cd7ab658695681160ffbc526e0b8655f4 assets\the_origin_of_magic\models\item\magic_bullet_with_trigger.json +982fb2d3ae94989d61be6d49ebcac381af5d841b assets\the_origin_of_magic\models\item\magic_energy_throw_boll.json 6e0df2c99a9c005ddce1ec13cf27aff50ee1081f assets\the_origin_of_magic\models\item\magic_bullet_with_time_trigger.json 02d3ff4716d16f7c5a4dd4432d1b98f744a13f02 assets\the_origin_of_magic\models\item\blood_essence.json 105ea751d9d55fefa41f158e8e462c2e69f451ed assets\the_origin_of_magic\models\item\magic_life_time_up.json @@ -12,6 +13,7 @@ f54d22f024ca8dbc5f81e759c90de28d15c18b17 assets\the_origin_of_magic\models\item\ ddf4e605ac73f757f76bbfe39d60312b7042e7d9 assets\the_origin_of_magic\models\item\hostile_entity_limiter.json 43e2c3caac7463f02d4048ca73f166772b1e1cb3 assets\the_origin_of_magic\models\item\magic_life_time_down.json 14f7b54096acc0b1b7b588d72bd80df62d566018 assets\the_origin_of_magic\models\item\earth_magic_element.json +da82fc5eab993db4c28ef8696169be167f60350e assets\the_origin_of_magic\models\item\null_magic.json da16015585e364c4561b91a3b83056d8c3646d1c assets\the_origin_of_magic\models\item\gold_magic_element.json 1dce304afb036f29cfc41d921aca0fd0bb0e8f7a assets\the_origin_of_magic\models\item\ray_magic.json 681374800d5b4991c2e8d6304781b89089bd379c assets\the_origin_of_magic\models\item\poison_magic.json diff --git a/src/main/generated/assets/the_origin_of_magic/lang/en_us.json b/src/main/generated/assets/the_origin_of_magic/lang/en_us.json index e6674e7..a6f02fe 100644 --- a/src/main/generated/assets/the_origin_of_magic/lang/en_us.json +++ b/src/main/generated/assets/the_origin_of_magic/lang/en_us.json @@ -14,9 +14,11 @@ "item.the_origin_of_magic.magic_bullet_with_time_trigger": "Magic Bullet With Time Trigger", "item.the_origin_of_magic.magic_bullet_with_trigger": "Magic Bullet With Trigger", "item.the_origin_of_magic.magic_core": "Magic Core", + "item.the_origin_of_magic.magic_energy_throw_boll": "Magic Energy Throw Boll", "item.the_origin_of_magic.magic_life_time_down": "Magic Life Time Down", "item.the_origin_of_magic.magic_life_time_up": "Magic Life Time Up", "item.the_origin_of_magic.nature_magic_element": "Nature Magic Element", + "item.the_origin_of_magic.null_magic": "Null Magic", "item.the_origin_of_magic.poison_magic": "Poison Magic", "item.the_origin_of_magic.ray_magic": "Ray Magic", "item.the_origin_of_magic.ray_magic.effect.fire_resistance": "Fire resistance Ray Magic", diff --git a/src/main/generated/assets/the_origin_of_magic/models/item/null_magic.json b/src/main/generated/assets/the_origin_of_magic/models/item/null_magic.json new file mode 100644 index 0000000..301de6b --- /dev/null +++ b/src/main/generated/assets/the_origin_of_magic/models/item/null_magic.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "the_origin_of_magic:item/null_magic" + } +} \ No newline at end of file diff --git a/src/main/java/com/ictye/the_origin_of_magic/Contents/AllEntity.java b/src/main/java/com/ictye/the_origin_of_magic/Contents/AllEntity.java index d0575aa..3e479be 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/Contents/AllEntity.java +++ b/src/main/java/com/ictye/the_origin_of_magic/Contents/AllEntity.java @@ -1,6 +1,7 @@ package com.ictye.the_origin_of_magic.Contents; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.*; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.*; import com.ictye.the_origin_of_magic.infrastructure.Renders.MagicsRender.MagicRender; import com.ictye.the_origin_of_magic.the_origin_of_magic; import net.fabricmc.api.EnvType; @@ -67,14 +68,23 @@ public class AllEntity { public static final EntityType MAGIC_BULLET_WITH_TIME_TRIGGER_ENTITY_TYPE = the_origin_of_magic.MOD_REGISTRATE.entityBuilder( - FabricEntityTypeBuilder - .create(SpawnGroup.MISC, MagicBulletWithTimeTrigger::new) + FabricEntityTypeBuilder .create(SpawnGroup.MISC, MagicBulletWithTimeTrigger::new) .dimensions(EntityDimensions.fixed(0.25F, 0.25F)) .trackRangeBlocks(4).trackedUpdateRate(10) .build(), "magic_bullet_with_time_trigger" ); + public static final EntityType MAGIC_ENERGY_THROW_BOLL_ENTITY_TYPE = the_origin_of_magic.MOD_REGISTRATE.entityBuilder( + FabricEntityTypeBuilder + .create(SpawnGroup.MISC, MagicEnergyThrowBoll::new) + .dimensions(EntityDimensions.fixed(0.25F, 0.25F)) + .trackRangeBlocks(4).trackedUpdateRate(10) + .build(), + "magic_energy_throw_boll" + ); + + /** * 注冊魔法實體渲染器 */ @@ -87,5 +97,6 @@ public static void regEntityRenderer(){ EntityRendererRegistry.register(POISON_RAY_MAGIC_ENTITY_TYPE, MagicRender::new); EntityRendererRegistry.register(MAGIC_BULLET_WITH_TRIGGER_ENTITY_TYPE, MagicRender::new); EntityRendererRegistry.register(MAGIC_BULLET_WITH_TIME_TRIGGER_ENTITY_TYPE, MagicRender::new); + EntityRendererRegistry.register(MAGIC_ENERGY_THROW_BOLL_ENTITY_TYPE, MagicRender::new); } } diff --git a/src/main/java/com/ictye/the_origin_of_magic/Contents/AllItem.java b/src/main/java/com/ictye/the_origin_of_magic/Contents/AllItem.java index 1cdedf8..aef62ce 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/Contents/AllItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/Contents/AllItem.java @@ -2,8 +2,9 @@ import com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic.MagicLIfeTimeDownItem; import com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic.MagicLifeTimeUpItem; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.*; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic.NullMagicItem; import com.ictye.the_origin_of_magic.foundation.Items.Magic.LimiterItem.UndeadEntityLimiterItem; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic.*; import com.ictye.the_origin_of_magic.foundation.Items.Staff.DeadwoodStaff; import com.ictye.the_origin_of_magic.foundation.Items.Staff.TestStaff; import com.ictye.the_origin_of_magic.infrastructure.ModRegistrate; @@ -87,7 +88,6 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), null ); @@ -101,7 +101,6 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), AllEntity.POISON_RAY_MAGIC_ENTITY_TYPE ); @@ -114,7 +113,6 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), AllEntity.MAGIC_BULLET_ENTITY_TYPE ); @@ -127,7 +125,6 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), AllEntity.MAGIC_BULLET_WITH_TRIGGER_ENTITY_TYPE ); @@ -140,11 +137,26 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), AllEntity.MAGIC_BULLET_WITH_TIME_TRIGGER_ENTITY_TYPE ); + + public static final Item MAGIC_ENERGY_THROW_BOLL_ITEM = the_origin_of_magic.MOD_REGISTRATE.itemBuilder( + MagicEnergyThrowBollItem::new, + "magic_energy_throw_boll", + "Magic Energy Throw Boll", + Models.GENERATED, + new FabricItemSettings() + .maxCount(1) + .group(TheOriginOfMagicItemGroup) + .rarity(Rarity.COMMON), + AllEntity.MAGIC_ENERGY_THROW_BOLL_ENTITY_TYPE + ); + + /** + * 魔法时间增加 + */ public static final Item MAGIC_LIFE_TIME_UP = the_origin_of_magic.MOD_REGISTRATE.itemBuilder( MagicLifeTimeUpItem::new, "magic_life_time_up", @@ -153,11 +165,13 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) .rarity(Rarity.COMMON), null ); + /** + * 魔法时间降低 + */ public static final Item MAGIC_LIFE_TIME_DOWN = the_origin_of_magic.MOD_REGISTRATE.itemBuilder( MagicLIfeTimeDownItem::new, "magic_life_time_down", @@ -166,7 +180,21 @@ public class AllItem { new FabricItemSettings() .maxCount(1) .group(TheOriginOfMagicItemGroup) - .maxDamage(100) + .rarity(Rarity.COMMON), + null + ); + + /** + * 零刻魔法 + */ + public static final Item NULL_MAGIC = the_origin_of_magic.MOD_REGISTRATE.itemBuilder( + NullMagicItem::new, + "null_magic", + "Null Magic", + Models.GENERATED, + new FabricItemSettings() + .maxCount(1) + .group(TheOriginOfMagicItemGroup) .rarity(Rarity.COMMON), null ); diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/NullMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/NullMagic.java new file mode 100644 index 0000000..5bb807c --- /dev/null +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/NullMagic.java @@ -0,0 +1,10 @@ +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic; + +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdCastInterface; + +public class NullMagic extends StdAttrMagic{ + @Override + public void onUse(StdCastInterface magic) { + magic.setAge(0); + } +} diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdDriestEffectMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdDriestEffectMagic.java similarity index 91% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdDriestEffectMagic.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdDriestEffectMagic.java index 406a01c..334b5eb 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdDriestEffectMagic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdDriestEffectMagic.java @@ -1,4 +1,4 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdCastInterface; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdThrownMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdThrownMagic.java similarity index 95% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdThrownMagic.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdThrownMagic.java index 218e7c1..e332c6a 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdThrownMagic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicInterfaces/StdMagic/StdThrownMagic.java @@ -1,4 +1,4 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.EffectMagic.StdEffectMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.Limiters.StdMagicLimiter; @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; -public abstract class StdThrownMagic extends ProjectileEntity implements FlyingItemEntity,StdCastInterface { +public abstract class StdThrownMagic extends ProjectileEntity implements FlyingItemEntity, StdCastInterface { protected PRDRandom prdRandom; @@ -43,7 +43,7 @@ public abstract class StdThrownMagic extends ProjectileEntity implements FlyingI */ private List additionMagicList = new ArrayList<>(); - private List effectMagicList = new ArrayList<>(); + private final List effectMagicList = new ArrayList<>(); /** * 添加法術效果 @@ -56,7 +56,7 @@ public void addEffect(StdEffectMagic effectMagic) { /** * 限制器列表 */ - private List limiters = new ArrayList<>(); + private final List limiters = new ArrayList<>(); /** * 添加監聽 @@ -72,12 +72,12 @@ public void addLimiter(StdMagicLimiter limiter){ protected float explosionRate; public float getExplosionRate() { - return explosionRate; + return Math.min(explosionRate,1); } protected int lit = 15; - protected int age = 0; + protected int ageCount = 0; private int ageRate = 1; @@ -109,12 +109,14 @@ public float getMagicRate() { return magicRate; } + protected int totalAge = 200; + public int getAge(){ - return 200; + return totalAge; } public void setAge(int age) { - this.age = age; + this.totalAge = age; } public void setAgeRate(int ageRate) { @@ -320,7 +322,6 @@ public void tick() { this.updateRotation(); if (this.isTouchingWater()) { for (int i = 0; i < 4; ++i) { - float g = 0.25f; this.world.addParticle(ParticleTypes.BUBBLE, d - vec3d.x * 0.25, e - vec3d.y * 0.25, f - vec3d.z * 0.25, vec3d.x, vec3d.y, vec3d.z); } h = 0.8f; @@ -336,8 +337,8 @@ public void tick() { } this.setPosition(d, e, f); - age++; - if (age>=getAge() * Math.min(this.ageRate,1)){ + ageCount++; + if (ageCount >=getAge() * Math.min(this.ageRate,1)){ if(ageCast){ if(!world.isClient){ castAddiMagic(); @@ -383,11 +384,6 @@ public MagicSetting Setting(){ @SuppressWarnings("UnusedReturnValue") public class MagicSetting{ - public MagicSetting age(int a){ - age = a; - return this; - } - public MagicSetting ageRate(int a){ ageRate = a; return this; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/ExplosionThrownMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/ExplosionThrownMagic.java similarity index 82% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/ExplosionThrownMagic.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/ExplosionThrownMagic.java index 513671e..12a4d80 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/ExplosionThrownMagic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/ExplosionThrownMagic.java @@ -1,6 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; @@ -14,16 +15,11 @@ * 爆炸法術 */ public class ExplosionThrownMagic extends StdThrownMagic { - - private float explosionRate; - @Override protected boolean isWaterSlowDown() { return true; } - ////////////////////// - //構造器（們？） public ExplosionThrownMagic(EntityType entityType, World world) { super(entityType, world); this.explosionRate = 1.0F; @@ -33,7 +29,6 @@ public ExplosionThrownMagic(EntityType type, LivingEnt super(type, owner, world); this.explosionRate = 1.0F; } - ///////////////////// @Override protected void collision(HitResult hitResult) { @@ -51,9 +46,9 @@ public void remove(RemovalReason reason) { Vec3d pos = this.getPos(); if(reason != RemovalReason.KILLED){ if(prdRandom!=null && prdRandom.getBool()){ - this.world.createExplosion(this, pos.getX(), pos.getY(), pos.getZ(), 5.0F * explosionRate, Explosion.DestructionType.BREAK); + this.world.createExplosion(this, pos.getX(), pos.getY(), pos.getZ(), 5.0F * getExplosionRate(), Explosion.DestructionType.BREAK); }else { - this.world.createExplosion(this, pos.getX(), pos.getY(), pos.getZ(), 3.0F * explosionRate, Explosion.DestructionType.BREAK); + this.world.createExplosion(this, pos.getX(), pos.getY(), pos.getZ(), 3.0F * getExplosionRate(), Explosion.DestructionType.BREAK); } } super.remove(reason); @@ -68,7 +63,6 @@ public ItemStack getStack() { public void tick() { super.tick(); this.world.addParticle(ParticleTypes.FIREWORK, this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); - Vec3d v = this.getVelocity(); for(int i = 8;i > 0;i--){ double x = random.nextDouble() * 2 - 1; double y = random.nextDouble() * 2 - 1; @@ -76,9 +70,4 @@ public void tick() { this.world.addParticle(ParticleTypes.FLAME, this.getX(), this.getY(), this.getZ(), x/2, y/2, z/2); } } - - @Override - public void setAge(int age) { - this.age = age; - } } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBullet.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBullet.java similarity index 89% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBullet.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBullet.java index eac750e..f590ec0 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBullet.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBullet.java @@ -1,6 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllParticle; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; @@ -9,7 +10,7 @@ import net.minecraft.util.hit.EntityHitResult; import net.minecraft.world.World; -public class MagicBullet extends StdThrownMagic{ +public class MagicBullet extends StdThrownMagic { public MagicBullet(EntityType entityType, World world) { super(entityType, world); } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTimeTrigger.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTimeTrigger.java similarity index 90% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTimeTrigger.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTimeTrigger.java index 3f5c0ac..c519637 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTimeTrigger.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTimeTrigger.java @@ -1,6 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllParticle; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; @@ -10,7 +11,7 @@ import net.minecraft.util.hit.EntityHitResult; import net.minecraft.world.World; -public class MagicBulletWithTimeTrigger extends StdThrownMagic{ +public class MagicBulletWithTimeTrigger extends StdThrownMagic { @Override public float getMagicRate() { return 2; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTrigger.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTrigger.java similarity index 92% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTrigger.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTrigger.java index 667e401..1737e09 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBulletWithTrigger.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicBulletWithTrigger.java @@ -1,6 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllParticle; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicEnergyThrowBoll.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicEnergyThrowBoll.java new file mode 100644 index 0000000..88953d1 --- /dev/null +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/MagicEnergyThrowBoll.java @@ -0,0 +1,52 @@ +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; + +import com.ictye.the_origin_of_magic.Contents.AllItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.ItemStack; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.world.World; + +public class MagicEnergyThrowBoll extends StdThrownMagic { + public MagicEnergyThrowBoll(EntityType entityType, World world) { + super(entityType, world); + isReflect = true; + } + + public MagicEnergyThrowBoll(EntityType type, double x, double y, double z, World world) { + super(type, x, y, z, world); + isReflect = true; + } + + public MagicEnergyThrowBoll(EntityType type, LivingEntity owner, World world) { + super(type, owner, world); + isReflect = true; + } + + @Override + protected float getGravity() { + return super.getGravity() * 0.5f; + } + + @Override + protected void onEntityHit(EntityHitResult entityHitResult) { + if(prdRandom!=null){ + prdRandom.setSP((float) (prdRandom.getP() + 0.35)); + if(prdRandom.getBool()){ + entityHitResult.getEntity().damage(DamageSource.thrownProjectile(this, this.getOwner()), 9); + }else { + entityHitResult.getEntity().damage(DamageSource.thrownProjectile(this, this.getOwner()), 5); + } + }else { + entityHitResult.getEntity().damage(DamageSource.thrownProjectile(this, this.getOwner()), 5); + } + super.onEntityHit(entityHitResult); + } + + @Override + public ItemStack getStack() { + return new ItemStack(AllItem.MAGIC_ENERGY_THROW_BOLL_ITEM); + } +} diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/PoisonThrownMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/PoisonThrownMagic.java similarity index 85% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/PoisonThrownMagic.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/PoisonThrownMagic.java index 0acc59f..94dc026 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/PoisonThrownMagic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/PoisonThrownMagic.java @@ -1,6 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; @@ -9,7 +10,7 @@ import net.minecraft.util.hit.EntityHitResult; import net.minecraft.world.World; -public class PoisonThrownMagic extends StdThrownMagic{ +public class PoisonThrownMagic extends StdThrownMagic { public PoisonThrownMagic(EntityType entityType, World world) { super(entityType, world); magicRate = 3; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/RayMagic.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/RayMagic.java similarity index 96% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/RayMagic.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/RayMagic.java index 5e3abf9..7da55ea 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/RayMagic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/StdMagic/RayMagic.java @@ -1,7 +1,8 @@ -package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; +package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic; import com.google.common.collect.Sets; import com.ictye.the_origin_of_magic.Contents.AllItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -25,7 +26,7 @@ import java.util.List; import java.util.Set; -public class RayMagic extends StdThrownMagic{ +public class RayMagic extends StdThrownMagic { private static final TrackedData COLOR = DataTracker.registerData(RayMagic.class, TrackedDataHandlerRegistry.INTEGER); private boolean colorSet; private Potion potion = Potions.EMPTY; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLIfeTimeDownItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLIfeTimeDownItem.java index 7ea7389..a37a6aa 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLIfeTimeDownItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLIfeTimeDownItem.java @@ -1,9 +1,9 @@ package com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic.MagicLifeTimeDown; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLifeTimeUpItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLifeTimeUpItem.java index b316faf..9ce9de8 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLifeTimeUpItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/MagicLifeTimeUpItem.java @@ -1,9 +1,9 @@ package com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic.MagicLifeTimeUp; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/NullMagicItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/NullMagicItem.java new file mode 100644 index 0000000..897fa54 --- /dev/null +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/CorrectionMagic/NullMagicItem.java @@ -0,0 +1,21 @@ +package com.ictye.the_origin_of_magic.foundation.Items.Magic.CorrectionMagic; + +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic.NullMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class NullMagicItem extends StdMagicItem { + public NullMagicItem(Settings settings, EntityType entityType) { + super(settings, entityType); + } + + @Override + public StdMagicInterface getMagic(PlayerEntity user, World world, ItemStack stack) { + return new NullMagic(); + } +} diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/EffectMagicItem/StdEffectItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/EffectMagicItem/StdEffectItem.java index a730d24..97a5e57 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/EffectMagicItem/StdEffectItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/EffectMagicItem/StdEffectItem.java @@ -1,7 +1,7 @@ package com.ictye.the_origin_of_magic.foundation.Items.Magic.EffectMagicItem; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; /** diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagicItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/Interface/StdMagicItem.java similarity index 84% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagicItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/Interface/StdMagicItem.java index cc84c73..bf2f830 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagicItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/Interface/StdMagicItem.java @@ -1,7 +1,7 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/StdLimiterItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/StdLimiterItem.java index d6623e4..1a5c985 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/StdLimiterItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/StdLimiterItem.java @@ -1,7 +1,7 @@ package com.ictye.the_origin_of_magic.foundation.Items.Magic.LimiterItem; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; /** diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/UndeadEntityLimiterItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/UndeadEntityLimiterItem.java index 4392838..729d49a 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/UndeadEntityLimiterItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/LimiterItem/UndeadEntityLimiterItem.java @@ -1,8 +1,8 @@ package com.ictye.the_origin_of_magic.foundation.Items.Magic.LimiterItem; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.Limiters.HostileEntityLimiter; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/ExplosionMagicEntityItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/ExplosionMagicEntityItem.java similarity index 79% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/ExplosionMagicEntityItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/ExplosionMagicEntityItem.java index 952f070..8436ee6 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/ExplosionMagicEntityItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/ExplosionMagicEntityItem.java @@ -1,8 +1,9 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllEntity; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.ExplosionThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.ExplosionThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletItem.java similarity index 74% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletItem.java index ef238c2..ad59a96 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletItem.java @@ -1,15 +1,16 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllEntity; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicBullet; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.MagicBullet; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class MagicBulletItem extends StdMagicItem{ +public class MagicBulletItem extends StdMagicItem { public MagicBulletItem(Settings settings, EntityType entityType) { super(settings, entityType); } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTimeTriggerItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTimeTriggerItem.java similarity index 78% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTimeTriggerItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTimeTriggerItem.java index 1c4ee59..9dfeac4 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTimeTriggerItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTimeTriggerItem.java @@ -1,15 +1,16 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllEntity; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicBulletWithTimeTrigger; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.MagicBulletWithTimeTrigger; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class MagicBulletWithTimeTriggerItem extends StdMagicItem{ +public class MagicBulletWithTimeTriggerItem extends StdMagicItem { public MagicBulletWithTimeTriggerItem(Settings settings, EntityType entityType) { super(settings, entityType); } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTriggerItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTriggerItem.java similarity index 73% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTriggerItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTriggerItem.java index b974673..31c0de1 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/MagicBulletWithTriggerItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicBulletWithTriggerItem.java @@ -1,15 +1,16 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllEntity; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicBulletWithTrigger; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.MagicBulletWithTrigger; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class MagicBulletWithTriggerItem extends StdMagicItem{ +public class MagicBulletWithTriggerItem extends StdMagicItem { public MagicBulletWithTriggerItem(Settings settings, EntityType entityType) { super(settings, entityType); } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicEnergyThrowBollItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicEnergyThrowBollItem.java new file mode 100644 index 0000000..c2101e1 --- /dev/null +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/MagicEnergyThrowBollItem.java @@ -0,0 +1,22 @@ +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; + +import com.ictye.the_origin_of_magic.Contents.AllEntity; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.MagicEnergyThrowBoll; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class MagicEnergyThrowBollItem extends StdMagicItem { + public MagicEnergyThrowBollItem(Settings settings, EntityType entityType) { + super(settings, entityType); + } + + @Override + public StdMagicInterface getMagic(PlayerEntity user, World world, ItemStack stack) { + return new MagicEnergyThrowBoll(AllEntity.MAGIC_ENERGY_THROW_BOLL_ENTITY_TYPE,user, world); + } +} diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/PoisonMagicEntityItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/PoisonMagicEntityItem.java similarity index 69% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/PoisonMagicEntityItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/PoisonMagicEntityItem.java index 5517486..e2cc969 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/PoisonMagicEntityItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/PoisonMagicEntityItem.java @@ -1,8 +1,9 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.PoisonThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.PoisonThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -13,7 +14,7 @@ /** * 中毒法術 */ -public class PoisonMagicEntityItem extends StdMagicItem{ +public class PoisonMagicEntityItem extends StdMagicItem { public PoisonMagicEntityItem(Settings settings, EntityType entityType) { super(settings, entityType); diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/RayMagicItem.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/RayMagicItem.java similarity index 83% rename from src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/RayMagicItem.java rename to src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/RayMagicItem.java index da47d68..47f5890 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/RayMagicItem.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Magic/StdMagic/RayMagicItem.java @@ -1,9 +1,10 @@ -package com.ictye.the_origin_of_magic.foundation.Items.Magic; +package com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagic; import com.ictye.the_origin_of_magic.Contents.AllEntity; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.RayMagic; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagic.RayMagic; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemGroup; @@ -15,7 +16,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.World; -public class RayMagicItem extends StdMagicItem{ +public class RayMagicItem extends StdMagicItem { public RayMagicItem(Settings settings, EntityType entityType) { super(settings, entityType); } diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Staff/StdStaff.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Staff/StdStaff.java index 11556c7..795387c 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Staff/StdStaff.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/Items/Staff/StdStaff.java @@ -4,10 +4,10 @@ import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.EffectMagic.StdEffectMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.Limiters.StdMagicLimiter; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdCastInterface; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdDriestEffectMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagicInterface; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdDriestEffectMagic; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import com.ictye.the_origin_of_magic.foundation.PlayerAbilities.MagicAbilitiesManager; import com.ictye.the_origin_of_magic.the_origin_of_magic; import com.ictye.the_origin_of_magic.utils.InterFaces.PlayerEntityMixinInterfaces; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/PlayerAbilities/MagicAbilitiesManager.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/PlayerAbilities/MagicAbilitiesManager.java index e569993..4665737 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/PlayerAbilities/MagicAbilitiesManager.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/PlayerAbilities/MagicAbilitiesManager.java @@ -1,8 +1,8 @@ package com.ictye.the_origin_of_magic.foundation.PlayerAbilities; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdDriestEffectMagic; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; -import com.ictye.the_origin_of_magic.infrastructure.netWork.NetworkIDFinder; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdDriestEffectMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; +import com.ictye.the_origin_of_magic.infrastructure.NetWork.NetworkIDFinder; import com.ictye.the_origin_of_magic.the_origin_of_magic; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; diff --git a/src/main/java/com/ictye/the_origin_of_magic/foundation/mixin/PlayerEntity/ServerEntityMixin.java b/src/main/java/com/ictye/the_origin_of_magic/foundation/mixin/PlayerEntity/ServerEntityMixin.java index 6775fb2..a8f8050 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/foundation/mixin/PlayerEntity/ServerEntityMixin.java +++ b/src/main/java/com/ictye/the_origin_of_magic/foundation/mixin/PlayerEntity/ServerEntityMixin.java @@ -1,7 +1,7 @@ package com.ictye.the_origin_of_magic.foundation.mixin.PlayerEntity; import com.ictye.the_origin_of_magic.foundation.PlayerAbilities.MagicAbilitiesManager; -import com.ictye.the_origin_of_magic.infrastructure.netWork.NetworkIDFinder; +import com.ictye.the_origin_of_magic.infrastructure.NetWork.NetworkIDFinder; import com.ictye.the_origin_of_magic.utils.InterFaces.PlayerEntityMixinInterfaces; import com.mojang.authlib.GameProfile; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; diff --git a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetWorkReg.java b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetWorkReg.java similarity index 90% rename from src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetWorkReg.java rename to src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetWorkReg.java index dae52b6..284ce1c 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetWorkReg.java +++ b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetWorkReg.java @@ -1,4 +1,4 @@ -package com.ictye.the_origin_of_magic.infrastructure.netWork; +package com.ictye.the_origin_of_magic.infrastructure.NetWork; import com.ictye.the_origin_of_magic.the_origin_of_magic; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; diff --git a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetworkIDFinder.java b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetworkIDFinder.java similarity index 79% rename from src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetworkIDFinder.java rename to src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetworkIDFinder.java index e431540..db73325 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/NetworkIDFinder.java +++ b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/NetworkIDFinder.java @@ -1,4 +1,4 @@ -package com.ictye.the_origin_of_magic.infrastructure.netWork; +package com.ictye.the_origin_of_magic.infrastructure.NetWork; import com.ictye.the_origin_of_magic.the_origin_of_magic; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/SyncHUDS2CPacket.java b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/SyncHUDS2CPacket.java similarity index 94% rename from src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/SyncHUDS2CPacket.java rename to src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/SyncHUDS2CPacket.java index bc503fb..88f33fe 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/netWork/SyncHUDS2CPacket.java +++ b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/NetWork/SyncHUDS2CPacket.java @@ -1,4 +1,4 @@ -package com.ictye.the_origin_of_magic.infrastructure.netWork; +package com.ictye.the_origin_of_magic.infrastructure.NetWork; import com.ictye.the_origin_of_magic.foundation.PlayerAbilities.MagicAbilitiesManager; import com.ictye.the_origin_of_magic.utils.InterFaces.PlayerEntityMixinInterfaces; diff --git a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/Renders/MagicsRender/MagicRender.java b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/Renders/MagicsRender/MagicRender.java index 8170f17..52a94f2 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/infrastructure/Renders/MagicsRender/MagicRender.java +++ b/src/main/java/com/ictye/the_origin_of_magic/infrastructure/Renders/MagicsRender/MagicRender.java @@ -1,6 +1,6 @@ package com.ictye.the_origin_of_magic.infrastructure.Renders.MagicsRender; -import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdThrownMagic; +import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.MagicInterfaces.StdMagic.StdThrownMagic; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.FlyingItemEntityRenderer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic.java b/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic.java index 1e22cdd..620da6f 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic.java +++ b/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic.java @@ -3,7 +3,7 @@ import com.ictye.the_origin_of_magic.Contents.AllBlockEntity; import com.ictye.the_origin_of_magic.Contents.AllItem; import com.ictye.the_origin_of_magic.infrastructure.ModRegistrate; -import com.ictye.the_origin_of_magic.infrastructure.netWork.NetWorkReg; +import com.ictye.the_origin_of_magic.infrastructure.NetWork.NetWorkReg; import com.ictye.the_origin_of_magic.utils.Math.PRDRandom; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; diff --git a/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic_client.java b/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic_client.java index 2bf9850..5931d6e 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic_client.java +++ b/src/main/java/com/ictye/the_origin_of_magic/the_origin_of_magic_client.java @@ -5,8 +5,8 @@ import com.ictye.the_origin_of_magic.Contents.AllParticle; import com.ictye.the_origin_of_magic.infrastructure.GUI.MagicWorkbench.MagicWorkbenchScreen; import com.ictye.the_origin_of_magic.infrastructure.GUI.MagicWorkbench.MagicWorkbenchScreenHandler; +import com.ictye.the_origin_of_magic.infrastructure.NetWork.NetWorkReg; import com.ictye.the_origin_of_magic.infrastructure.Renders.Colors.MagicRay; -import com.ictye.the_origin_of_magic.infrastructure.netWork.NetWorkReg; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/ictye/the_origin_of_magic/utils/MagicInventory.java b/src/main/java/com/ictye/the_origin_of_magic/utils/MagicInventory.java index 5bcb786..d74a9aa 100644 --- a/src/main/java/com/ictye/the_origin_of_magic/utils/MagicInventory.java +++ b/src/main/java/com/ictye/the_origin_of_magic/utils/MagicInventory.java @@ -1,6 +1,6 @@ package com.ictye.the_origin_of_magic.utils; -import com.ictye.the_origin_of_magic.foundation.Items.Magic.StdMagicItem; +import com.ictye.the_origin_of_magic.foundation.Items.Magic.Interface.StdMagicItem; import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; diff --git a/src/main/resources/assets/the_origin_of_magic/textures/item/magic_bullet_with_trigger.png b/src/main/resources/assets/the_origin_of_magic/textures/item/magic_bullet_with_trigger.png index 1d2d4075327dd7e3620b836bccb3b2240fcadd8e..dbbfc431fa20e785d762397e6d7dd2a07e3db7a7 100644 GIT binary patch delta 256 zcmV+b0ssE00;vL!F@NJpL_t(IjbmV-2KYad=RX4j1H=D&^Zq0ANi*c$y#N0XdHjbN zLM&i{+x%n|1H<(r3=B_JF_3BqMJ|A7rbZax1IMZ^!wtMz^bEytMi^tc%Z~pH3=9mB zdpsDC*~h9b|9^VwC4;n?I0OF=VFu|aL58Qx-ZNp=ePSBZ>jYHp84Q=EuwMYSU+iM>iic zn3QTU{9MJxz#jICLB&D=tK~TTf3@h@|C9drs2jMW00IE4J#v~l_L1HI0000AL delta 257 zcmV+c0sj7}0;&R#F@NMqL_t(IjbmV-2KfK};(rDP28RFl=KV+JlV-@hdH??(^7s!k zgjm1?xB1B`28QcL7#NmmU8Z7#J8L z_joWOvyW9>{{QsUO9p8(aR&Y$!VJ<;f(%cWy=TzwlVU_M0D2kpTF(B@z`(#D#VyOg z`&5|WyYxo}*A8oj9Se6eFg#;nFe%ky*feb$L(!rvMic{(ZH75r%#WAh)uzu3k8VC@ zFe%ky__>OWfj#UOgNlU$R?Bhv|7y{*|0n(LQ8#c$0R#X51fF*We643<00000NkvXX Hu0mjfdJK1S