-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4d2c704
commit a9bcaae
Showing
34 changed files
with
435 additions
and
64 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // 1.19.2 2024-04-22T21:56:57.611898 Language | ||
| 6470396c45f41baaa6f0da503628087520ede6ce assets\the_origin_of_magic\lang\en_us.json | ||
| // 1.19.2 2024-04-23T16:27:26.7336147 Language | ||
| d04d40d92f525332cba17675dca053783f282d5b assets\the_origin_of_magic\lang\en_us.json |
2 changes: 1 addition & 1 deletion
2
src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // 1.19.2 2024-04-22T21:56:57.615127 Block Loot Tables | ||
| // 1.19.2 2024-04-23T16:27:26.736128 Block Loot Tables | ||
| fe57f13449a11436bbede8c37e01bd0d1cd87191 data\the_origin_of_magic\loot_tables\blocks\magic_workbench.json |
6 changes: 5 additions & 1 deletion
6
src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/main/generated/assets/the_origin_of_magic/models/item/instant_damage_magic.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "the_origin_of_magic:item/instant_damage_magic" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/generated/assets/the_origin_of_magic/models/item/magic_bullet.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "the_origin_of_magic:item/magic_bullet" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/generated/assets/the_origin_of_magic/models/item/magic_life_time_down.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "the_origin_of_magic:item/magic_life_time_down" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/generated/assets/the_origin_of_magic/models/item/magic_life_time_up.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "the_origin_of_magic:item/magic_life_time_up" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
src/main/java/com/ictye/the_origin_of_magic/Contents/AllParticle.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.ictye.the_origin_of_magic.Contents; | ||
|
|
||
| import com.ictye.the_origin_of_magic.the_origin_of_magic; | ||
| import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; | ||
| import net.minecraft.particle.DefaultParticleType; | ||
|
|
||
| public class AllParticle { | ||
| public static final DefaultParticleType MAGIC_BULLET_PARTICLE = (DefaultParticleType) the_origin_of_magic.MOD_REGISTRATE.particleBuilder( | ||
| "magic_bullet_particle", | ||
| FabricParticleTypes.simple()); | ||
| } |
6 changes: 6 additions & 0 deletions
6
...ctye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/MagicLifeTimeDown.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic; | ||
|
|
||
| import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagicInterface; | ||
|
|
||
| public class MagicLifeTimeDown implements StdMagicInterface { | ||
| } |
6 changes: 6 additions & 0 deletions
6
.../ictye/the_origin_of_magic/foundation/Entitys/Magics/CorrectionMagic/MagicLifeTimeUp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.ictye.the_origin_of_magic.foundation.Entitys.Magics.CorrectionMagic; | ||
|
|
||
| import com.ictye.the_origin_of_magic.foundation.Entitys.Magics.StdMagicInterface; | ||
|
|
||
| public class MagicLifeTimeUp implements StdMagicInterface { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
.../java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/InstantDamageItemMagic.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; | ||
|
|
||
| import net.minecraft.entity.EntityType; | ||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.effect.StatusEffectInstance; | ||
| import net.minecraft.entity.effect.StatusEffects; | ||
| import net.minecraft.entity.projectile.thrown.ThrownEntity; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
| import net.minecraft.particle.ParticleTypes; | ||
| import net.minecraft.util.hit.EntityHitResult; | ||
| import net.minecraft.world.World; | ||
|
|
||
| public class InstantDamageItemMagic extends StdThrownMagic{ | ||
| public InstantDamageItemMagic(EntityType<? extends ThrownEntity> entityType, World world) { | ||
| super(entityType, world); | ||
| } | ||
|
|
||
| public InstantDamageItemMagic(EntityType<? extends StdThrownMagic> type, LivingEntity owner, World world) { | ||
| super(type, owner, world); | ||
| } | ||
|
|
||
| @Override | ||
| protected float getGravity() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| protected void onEntityHit(EntityHitResult entityHitResult) { | ||
| StatusEffectInstance poison = new StatusEffectInstance(StatusEffects.INSTANT_DAMAGE, 10); | ||
| ((LivingEntity)entityHitResult.getEntity()).addStatusEffect(poison); | ||
| super.onEntityHit(entityHitResult); | ||
| this.remove(RemovalReason.CHANGED_DIMENSION); | ||
| } | ||
|
|
||
| @Override | ||
| public void tick() { | ||
| this.world.addParticle(ParticleTypes.DAMAGE_INDICATOR, this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); | ||
| super.tick(); | ||
| } | ||
|
|
||
| @Override | ||
| public ItemStack getStack() { | ||
| return new ItemStack(Items.AIR); | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
src/main/java/com/ictye/the_origin_of_magic/foundation/Entitys/Magics/MagicBullet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.ictye.the_origin_of_magic.foundation.Entitys.Magics; | ||
|
|
||
| import com.ictye.the_origin_of_magic.Contents.AllParticle; | ||
| import net.minecraft.entity.EntityType; | ||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.damage.DamageSource; | ||
| import net.minecraft.entity.projectile.thrown.ThrownEntity; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
| import net.minecraft.util.hit.EntityHitResult; | ||
| import net.minecraft.world.World; | ||
|
|
||
| public class MagicBullet extends StdThrownMagic{ | ||
| public MagicBullet(EntityType<? extends ThrownEntity> entityType, World world) { | ||
| super(entityType, world); | ||
| } | ||
|
|
||
| protected MagicBullet(EntityType<? extends ThrownEntity> type, double x, double y, double z, World world) { | ||
| super(type, x, y, z, world); | ||
| } | ||
|
|
||
| public MagicBullet(EntityType<? extends ThrownEntity> type, LivingEntity owner, World world) { | ||
| super(type, owner, world); | ||
| } | ||
|
|
||
| @Override | ||
| public float getMagicRate() { | ||
| return 2; | ||
| } | ||
|
|
||
| @Override | ||
| public int getLit() { | ||
| return super.getLit(); | ||
| } | ||
|
|
||
| @Override | ||
| protected float getGravity() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void tick() { | ||
| super.tick(); | ||
| world.addParticle(AllParticle.MAGIC_BULLET_PARTICLE, getX(), getY(), getZ(), 0, 0, 0); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onEntityHit(EntityHitResult entityHitResult) { | ||
| entityHitResult.getEntity().damage(DamageSource.thrownProjectile(this, this.getOwner()), 4); | ||
| super.onEntityHit(entityHitResult); | ||
| } | ||
|
|
||
| @Override | ||
| public ItemStack getStack() { | ||
| return new ItemStack(Items.AIR); | ||
| } | ||
| } |
Oops, something went wrong.