lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added the Bounce Array and the temp recipe for the "Grove Array" (name pending, and NYI)

Browse source
This commit is contained in:
WayofTime 2020-12-31 15:50:14 -05:00
parent 510ec5cce5
commit c85a605b5a
9 changed files with 103 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -6,6 +6,7 @@ Version 3.0.4
- Two arrays, which changes the current daylight cycle to day and night.
- Fixed the JEI so that it no longer ouputs an error when loading Alchemy Array recipes without a crafting output.
- Fixed crash with Actually Additions
------------------------------------------------------

2
src/generated/resources/.cache/cache
View file

@ -568,9 +568,11 @@ a7f51456052d0fd317164d400cdd595ae2687df8 data/bloodmagic/recipes/arc/reversion/m
1e5814caf63714b8e1ff2b2f413a86ba8c840ebb data/bloodmagic/recipes/arc/weakbloodshard.json
e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json
d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json
f6b6c72c0a2d6b3e602976f0dd2dfa778be41777 data/bloodmagic/recipes/array/bounce.json
7110895fe75e65404bc66d6c09087d9e58220a11 data/bloodmagic/recipes/array/day.json
1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json
4bd220ced486f1d8fc4468ebd61dac755670d716 data/bloodmagic/recipes/array/fastminersigil.json
d9ae32c70d4bd872f22229006ad3c8e0cf7e3721 data/bloodmagic/recipes/array/grove.json
f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsigil.json
78c880321f0bfad14239d4b9d2edae170a7fa86e data/bloodmagic/recipes/array/lavasigil.json
165f8f8ba7ae094cdd1367716a0797a0f8d4d605 data/bloodmagic/recipes/array/living_boots.json

13
src/generated/resources/data/bloodmagic/recipes/array/bounce.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "bloodmagic:array",
"texture": "bloodmagic:textures/models/alchemyarrays/bouncearray.png",
"baseinput": {
"tag": "forge:slimeballs"
},
"addedinput": {
"tag": "forge:dusts/redstone"
},
"output": {
"item": "minecraft:air"
}
}

2
src/generated/resources/data/bloodmagic/recipes/array/day.json
View file

@ -5,7 +5,7 @@
"item": "minecraft:coal"
},
"addedinput": {
"item": "minecraft:coal"
"item": "minecraft:clock"
},
"output": {
"item": "minecraft:air"

13
src/generated/resources/data/bloodmagic/recipes/array/grove.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "bloodmagic:array",
"texture": "bloodmagic:textures/models/alchemyarrays/growthsigil.png",
"baseinput": {
"tag": "forge:bones"
},
"addedinput": {
"tag": "forge:bones"
},
"output": {
"item": "minecraft:air"
}
}

3
src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
View file

@ -110,6 +110,9 @@ public class ClientEvents
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/spike"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/day"), new DayAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/sunarray.png"), BloodMagic.rl("textures/models/alchemyarrays/sunarrayspikes.png"), BloodMagic.rl("textures/models/alchemyarrays/sunarraycircle.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/night"), new NightAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/moonarrayoutside.png"), BloodMagic.rl("textures/models/alchemyarrays/moonarraysymbols.png"), BloodMagic.rl("textures/models/alchemyarrays/moonarrayinside.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/grove"), new BeaconAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/bounce"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/bouncearray.png")));
}
public static void registerItemModelProperties(FMLClientSetupEvent event)

66
src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBounce.java Normal file
View file

@ -0,0 +1,66 @@
package wayoftime.bloodmagic.common.alchemyarray;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class AlchemyArrayEffectBounce extends AlchemyArrayEffect
{
public AlchemyArrayEffectBounce()
{
super();
}
@Override
public boolean update(TileAlchemyArray tile, int ticksActive)
{
return false;
}
@Override
public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity)
{
if (entity.isSneaking())
{
entity.fallDistance = 0;
} else if (entity.getMotion().y < 0.0D)
{
Vector3d motion = entity.getMotion();
motion = motion.mul(1, -1, 1);
if (!(entity instanceof LivingEntity))
{
motion = motion.mul(1, 0.8, 1);
}
entity.setMotion(motion);
entity.fallDistance = 0;
}
}
@Override
public AlchemyArrayEffect getNewCopy()
{
return new AlchemyArrayEffectBounce();
}
@Override
public void readFromNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
@Override
public void writeToNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
}

2
src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java
View file

@ -41,6 +41,8 @@ public class AlchemyArrayRecipeProvider implements ISubRecipeProvider
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.INGOTS_IRON), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "spike"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/sunarray.png"), Ingredient.fromItems(Items.COAL), Ingredient.fromItems(Items.COAL), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "day"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/moonarray.png"), Ingredient.fromItems(Items.LAPIS_LAZULI), Ingredient.fromItems(Items.LAPIS_LAZULI), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "night"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png"), Ingredient.fromTag(Tags.Items.BONES), Ingredient.fromTag(Tags.Items.BONES), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "grove"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/bouncearray.png"), Ingredient.fromTag(Tags.Items.SLIMEBALLS), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "bounce"));
// AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"),
// Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()),
// Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new

2
src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java
View file

@ -11,6 +11,7 @@ import net.minecraft.world.World;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBinding;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBounce;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectDay;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectMovement;
@ -41,6 +42,7 @@ public class AlchemyArrayRegistry
registerEffect(BloodMagic.rl("array/spike"), new AlchemyArrayEffectSpike());
registerEffect(BloodMagic.rl("array/day"), new AlchemyArrayEffectDay());
registerEffect(BloodMagic.rl("array/night"), new AlchemyArrayEffectNight());
registerEffect(BloodMagic.rl("array/bounce"), new AlchemyArrayEffectBounce());
}
public static AlchemyArrayEffect getEffect(World world, ResourceLocation rl, RecipeAlchemyArray recipe)