Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-25 08:28:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed problem in crusher datagen.

Browse source 
Fixed solidified xp.
This commit is contained in:
Flanks255 2021-11-24 12:19:31 -06:00
parent 925590f70d
commit be84dc69a9
7 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -4,6 +4,7 @@ buildscript {
mavenCentral() mavenCentral()
maven { url = 'https://maven.parchmentmc.org' } maven { url = 'https://maven.parchmentmc.org' }
maven { url "https://www.cursemaven.com" }
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
@ -82,6 +83,8 @@ dependencies {
compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api") compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
runtimeOnly fg.deobf("curse.maven:TOP-245211:3319255")
} }
// not sure if this is still needed // not sure if this is still needed

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

@ -346,7 +346,6 @@ c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_qu
6c045ca364ea3483083fe3be01f15508d485402a data/actuallyadditions/recipes/black_quartz_slab.json 6c045ca364ea3483083fe3be01f15508d485402a data/actuallyadditions/recipes/black_quartz_slab.json
f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json
c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json
26ac845ea63340266591b88f0008dfe7c84d901f data/actuallyadditions/recipes/bone_crusher.json
398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json 398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json
9840b640a62e061baaecc74efd1e7455c59b35e9 data/actuallyadditions/recipes/boots_quartz.json 9840b640a62e061baaecc74efd1e7455c59b35e9 data/actuallyadditions/recipes/boots_quartz.json
696e9cc478fd04fd21565b9513317cf9f124d4bd data/actuallyadditions/recipes/chest_quartz.json 696e9cc478fd04fd21565b9513317cf9f124d4bd data/actuallyadditions/recipes/chest_quartz.json
@ -354,6 +353,7 @@ c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_qu
bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json
9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json 9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json
160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json
b76b843a60a1c456a11d3bb932a93ab3753d6f58 data/actuallyadditions/recipes/crushing/bone_crusher.json
bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json
4fea2c334ed0e5a3ee2d93d570a576d230637242 data/actuallyadditions/recipes/diamatine_axe.json 4fea2c334ed0e5a3ee2d93d570a576d230637242 data/actuallyadditions/recipes/diamatine_axe.json
4a7fe43b6202d8e46c1c9dd16fd1ea7039c25d4a data/actuallyadditions/recipes/diamatine_boots.json 4a7fe43b6202d8e46c1c9dd16fd1ea7039c25d4a data/actuallyadditions/recipes/diamatine_boots.json

7
src/generated/resources/data/actuallyadditions/recipes/bone_crusher.json → src/generated/resources/data/actuallyadditions/recipes/crushing/bone_crusher.json
View file

@ -4,10 +4,13 @@
"item": "minecraft:bone" "item": "minecraft:bone"
}, },
"result": [ "result": [
{
"item": "minecraft:bone_meal",
"chance": 1.0
},
{ {
"item": "minecraft:air", "item": "minecraft:air",
"chance": 0.0 "chance": 0.0
}, }
{}
] ]
} }

2
src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java
View file

@ -26,7 +26,7 @@ public class CrushingRecipeGenerator extends RecipeProvider {
@Override @Override
protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer) { protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer) {
consumer.accept(new CrushingRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "bone_crusher"), consumer.accept(new CrushingRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "crushing/bone_crusher"),
Ingredient.of(Items.BONE), Items.BONE_MEAL, 6, 1.0f , Items.AIR, 0, 0.0f)); Ingredient.of(Items.BONE), Items.BONE_MEAL, 6, 1.0f , Items.AIR, 0, 0.0f));
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java
View file

@ -181,8 +181,8 @@ public class CrushingRecipe implements IRecipe<IInventory> {
result1.addProperty("chance", outputChance1); result1.addProperty("chance", outputChance1);
JsonObject result2 = new JsonObject(); JsonObject result2 = new JsonObject();
result1.addProperty("item", outputTwo.asItem().getRegistryName().toString()); result2.addProperty("item", outputTwo.asItem().getRegistryName().toString());
result1.addProperty("chance", outputChance2); result2.addProperty("chance", outputChance2);
JsonArray resultList = new JsonArray(); JsonArray resultList = new JsonArray();
resultList.add(result1); resultList.add(result1);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java
View file

@ -75,7 +75,7 @@ public class ItemSolidifiedExperience extends ItemBase {
orb.getPersistentData().putBoolean(ActuallyAdditions.MODID + "FromSolidified", true); orb.getPersistentData().putBoolean(ActuallyAdditions.MODID + "FromSolidified", true);
world.addFreshEntity(orb); world.addFreshEntity(orb);
} else { } else {
player.giveExperienceLevels(amount); player.giveExperiencePoints(amount);
} }
} }
return ActionResult.success(stack); return ActionResult.success(stack);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java
View file

@ -118,7 +118,7 @@ public class ItemWingsOfTheBats extends ItemBase {
if (event.getEntityLiving() instanceof PlayerEntity) { if (event.getEntityLiving() instanceof PlayerEntity) {
PlayerEntity player = (PlayerEntity) event.getEntityLiving(); PlayerEntity player = (PlayerEntity) event.getEntityLiving();
if (!player.isCreative() && !player.isSpectator()) { if (false &&!player.isCreative() && !player.isSpectator()) { //TODO disabled for now.
PlayerData.PlayerSave data = PlayerData.getDataFromPlayer(player); PlayerData.PlayerSave data = PlayerData.getDataFromPlayer(player);
if (!player.level.isClientSide) { if (!player.level.isClientSide) {