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

Will Crystall drop fix

Browse source 
Fixed the LootTable generator so that it actually dropped the correct number of crystals on breaking.
This commit is contained in:
WayofTime 2020-11-07 20:26:45 -05:00
parent eb1fb71f43
commit be8737c096
9 changed files with 258 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.16.3-3.0.0-2'
version = '1.16.3-3.0.0-3'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'BloodMagic'

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

@ -262,10 +262,10 @@ c92a9f2a90f2c17933f89832899c295cde1f194d data/bloodmagic/loot_tables/blocks/alch
f1a8e3131d85077665563372cad868534a72fb31 data/bloodmagic/loot_tables/blocks/bloodlight.json
f0827ad5bf71c06a71f50aeb0298c04d0cb1a1d9 data/bloodmagic/loot_tables/blocks/bloodstonebrick.json
779b809a2a51e6dab46f9e6799249f2f14653ebb data/bloodmagic/loot_tables/blocks/chargingrune.json
56643f0e11eaac974a1a95decf31681b7d3ced81 data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json
0d501e4eb447e84b38250ab1c396abe1218d129c data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json
4c9ed83e7e7215f995df35054e96d2f4e5027016 data/bloodmagic/loot_tables/blocks/demoncrucible.json
c590b923d28b3d7916932dfcb05091df815f71dd data/bloodmagic/loot_tables/blocks/demoncrystallizer.json
9b606397733431055d56b886945365aeb62243b0 data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json
b0ce964c69f63aa13350259279e5fe831ae18e2c data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json
a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/dislocationrune.json
26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/duskritualstone.json
26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/earthritualstone.json
@ -274,14 +274,14 @@ a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/disl
26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/lightritualstone.json
72610188b4538d98ffcd015c2813d63d19889d5f data/bloodmagic/loot_tables/blocks/masterritualstone.json
95442c1bb740fab2eb8ee051f7184813f6023afa data/bloodmagic/loot_tables/blocks/orbcapacityrune.json
ed027e8a12be5cb6f68bf75b085da233b1ff78c7 data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json
6c59e846922061c0f2249b0c73c3be89ec73ea31 data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json
26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/ritualstone.json
e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacrificerune.json
9b697e37046b6238b3a19eae9113b88010ccff32 data/bloodmagic/loot_tables/blocks/selfsacrificerune.json
f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soulforge.json
015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json
b91f5b06e826205b3da972ef1f12dc37670412ac data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json
530c9c82fc508125223cedccbdacf623d1d3a1ff data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json
128ec3ee93e927d457beeb8161e80706e9239760 data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json
33a22d9b198c93ed07ac69b7a594bb08db64b239 data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json
26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/waterritualstone.json
2df19ff659705a5408ce0819a947764673404388 data/bloodmagic/recipes/alchemy_table.json
a343604b5a75e1b3810df97d024813fb041cffb6 data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json

49
src/generated/resources/data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json
View file

@ -15,7 +15,12 @@
}
}
],
"quality": 1,
"functions": [
{
"function": "minecraft:set_count",
"count": 1
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -34,7 +39,12 @@
}
}
],
"quality": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": 2
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -53,7 +63,12 @@
}
}
],
"quality": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": 3
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -72,7 +87,12 @@
}
}
],
"quality": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": 4
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -91,7 +111,12 @@
}
}
],
"quality": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": 5
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -110,7 +135,12 @@
}
}
],
"quality": 6,
"functions": [
{
"function": "minecraft:set_count",
"count": 6
}
],
"name": "bloodmagic:corrosivecrystal"
}
]
@ -129,7 +159,12 @@
}
}
],
"quality": 7,
"functions": [
{
"function": "minecraft:set_count",
"count": 7
}
],
"name": "bloodmagic:corrosivecrystal"
}
]

49
src/generated/resources/data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json
View file

@ -15,7 +15,12 @@
}
}
],
"quality": 1,
"functions": [
{
"function": "minecraft:set_count",
"count": 1
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -34,7 +39,12 @@
}
}
],
"quality": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": 2
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -53,7 +63,12 @@
}
}
],
"quality": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": 3
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -72,7 +87,12 @@
}
}
],
"quality": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": 4
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -91,7 +111,12 @@
}
}
],
"quality": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": 5
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -110,7 +135,12 @@
}
}
],
"quality": 6,
"functions": [
{
"function": "minecraft:set_count",
"count": 6
}
],
"name": "bloodmagic:destructivecrystal"
}
]
@ -129,7 +159,12 @@
}
}
],
"quality": 7,
"functions": [
{
"function": "minecraft:set_count",
"count": 7
}
],
"name": "bloodmagic:destructivecrystal"
}
]

49
src/generated/resources/data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json
View file

@ -15,7 +15,12 @@
}
}
],
"quality": 1,
"functions": [
{
"function": "minecraft:set_count",
"count": 1
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -34,7 +39,12 @@
}
}
],
"quality": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": 2
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -53,7 +63,12 @@
}
}
],
"quality": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": 3
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -72,7 +87,12 @@
}
}
],
"quality": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": 4
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -91,7 +111,12 @@
}
}
],
"quality": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": 5
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -110,7 +135,12 @@
}
}
],
"quality": 6,
"functions": [
{
"function": "minecraft:set_count",
"count": 6
}
],
"name": "bloodmagic:defaultcrystal"
}
]
@ -129,7 +159,12 @@
}
}
],
"quality": 7,
"functions": [
{
"function": "minecraft:set_count",
"count": 7
}
],
"name": "bloodmagic:defaultcrystal"
}
]

49
src/generated/resources/data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json
View file

@ -15,7 +15,12 @@
}
}
],
"quality": 1,
"functions": [
{
"function": "minecraft:set_count",
"count": 1
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -34,7 +39,12 @@
}
}
],
"quality": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": 2
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -53,7 +63,12 @@
}
}
],
"quality": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": 3
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -72,7 +87,12 @@
}
}
],
"quality": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": 4
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -91,7 +111,12 @@
}
}
],
"quality": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": 5
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -110,7 +135,12 @@
}
}
],
"quality": 6,
"functions": [
{
"function": "minecraft:set_count",
"count": 6
}
],
"name": "bloodmagic:steadfastcrystal"
}
]
@ -129,7 +159,12 @@
}
}
],
"quality": 7,
"functions": [
{
"function": "minecraft:set_count",
"count": 7
}
],
"name": "bloodmagic:steadfastcrystal"
}
]

49
src/generated/resources/data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json
View file

@ -15,7 +15,12 @@
}
}
],
"quality": 1,
"functions": [
{
"function": "minecraft:set_count",
"count": 1
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -34,7 +39,12 @@
}
}
],
"quality": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": 2
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -53,7 +63,12 @@
}
}
],
"quality": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": 3
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -72,7 +87,12 @@
}
}
],
"quality": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": 4
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -91,7 +111,12 @@
}
}
],
"quality": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": 5
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -110,7 +135,12 @@
}
}
],
"quality": 6,
"functions": [
{
"function": "minecraft:set_count",
"count": 6
}
],
"name": "bloodmagic:vengefulcrystal"
}
]
@ -129,7 +159,12 @@
}
}
],
"quality": 7,
"functions": [
{
"function": "minecraft:set_count",
"count": 7
}
],
"name": "bloodmagic:vengefulcrystal"
}
]

3
src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java
View file

@ -26,6 +26,7 @@ import net.minecraft.loot.LootTableManager;
import net.minecraft.loot.ValidationTracker;
import net.minecraft.loot.conditions.BlockStateProperty;
import net.minecraft.loot.conditions.ILootCondition;
import net.minecraft.loot.functions.SetCount;
import net.minecraft.state.Property;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
@ -96,7 +97,7 @@ public class GeneratorLootTable extends LootTableProvider
for (int i = 0; i < 7; i++)
{
ILootCondition.IBuilder harvestAge = BlockStateProperty.builder(block).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withIntProp(BlockDemonCrystal.AGE, i));
builder = builder.addLootPool(LootPool.builder().addEntry(ItemLootEntry.builder(item).quality(i + 1).acceptCondition(harvestAge)));
builder = builder.addLootPool(LootPool.builder().addEntry(ItemLootEntry.builder(item).acceptFunction(SetCount.builder(ConstantRange.of(i + 1))).acceptCondition(harvestAge)));
}
this.registerLootTable(block, builder);

94
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java
View file

@ -22,6 +22,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.SwordItem;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.text.ITextComponent;
@ -43,42 +45,27 @@ import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMultiWillTool
{
public static int[] soulBracket = new int[]
{ 16, 60, 200, 400, 1000, 2000, 4000 };
public static double[] defaultDamageAdded = new double[]
{ 1, 1.5, 2, 2.5, 3, 3.5, 4 };
public static double[] destructiveDamageAdded = new double[]
{ 1.5, 2.25, 3, 3.75, 4.5, 5.25, 6 };
public static double[] vengefulDamageAdded = new double[]
{ 0, 0.5, 1, 1.5, 2, 2.25, 2.5 };
public static double[] steadfastDamageAdded = new double[]
{ 0, 0.5, 1, 1.5, 2, 2.25, 2.5 };
public static double[] soulDrainPerSwing = new double[]
{ 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.25 };
public static double[] soulDrop = new double[]
{ 2, 4, 7, 10, 13, 15, 18 };
public static double[] staticDrop = new double[]
{ 1, 1, 2, 3, 3, 4, 4 };
public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000, 2000, 4000 };
public static double[] defaultDamageAdded = new double[] { 1, 1.5, 2, 2.5, 3, 3.5, 4 };
public static double[] destructiveDamageAdded = new double[] { 1.5, 2.25, 3, 3.75, 4.5, 5.25, 6 };
public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 };
public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 };
public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.25 };
public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 15, 18 };
public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 4, 4 };
public static double[] healthBonus = new double[]
{ 0, 0, 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later
public static double[] vengefulAttackSpeed = new double[]
{ -2.1, -2, -1.8, -1.7, -1.6, -1.6, -1.5 };
public static double[] destructiveAttackSpeed = new double[]
{ -2.6, -2.7, -2.8, -2.9, -3, -3, -3 };
public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later
public static double[] vengefulAttackSpeed = new double[] { -2.1, -2, -1.8, -1.7, -1.6, -1.6, -1.5 };
public static double[] destructiveAttackSpeed = new double[] { -2.6, -2.7, -2.8, -2.9, -3, -3, -3 };
public static int[] absorptionTime = new int[]
{ 200, 300, 400, 500, 600, 700, 800 };
public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600, 700, 800 };
public static double maxAbsorptionHearts = 10;
public static int[] poisonTime = new int[]
{ 25, 50, 60, 80, 100, 120, 150 };
public static int[] poisonLevel = new int[]
{ 0, 0, 0, 1, 1, 1, 1 };
public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100, 120, 150 };
public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1, 1, 1 };
public static double[] movementSpeed = new double[]
{ 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4 };
public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4 };
public ItemSentientSword()
{
@ -195,27 +182,27 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM
public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, LivingEntity attacker)
{
// switch (type)
// {
// case CORROSIVE:
// target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket]));
// break;
// case DEFAULT:
// break;
// case DESTRUCTIVE:
// break;
// case STEADFAST:
// if (!target.isEntityAlive())
// {
// float absorption = attacker.getAbsorptionAmount();
// attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127));
// attacker.setAbsorptionAmount((float) Math.min(absorption
// + target.getMaxHealth() * 0.05f, maxAbsorptionHearts));
// }
// break;
// case VENGEFUL:
// break;
// }
switch (type)
{
case CORROSIVE:
target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket]));
break;
case DEFAULT:
break;
case DESTRUCTIVE:
break;
case STEADFAST:
if (!target.isAlive())
{
float absorption = attacker.getAbsorptionAmount();
attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127, false, false));
attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth()
* 0.05f, maxAbsorptionHearts));
}
break;
case VENGEFUL:
break;
}
}
@Override
@ -356,9 +343,8 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM
{
if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4)
{
ItemStack soulStack = soul.createWill(willModifier
* (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble()
+ this.getStaticDropOfActivatedSword(stack))
ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack)
* attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack))
* killedEntity.getMaxHealth() / 20d);
soulList.add(soulStack);
}