diff --git a/build.gradle b/build.gradle index 458a1bbeb..b9312c63a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { mavenCentral() maven { url = 'https://maven.parchmentmc.org' } + maven { url "https://www.cursemaven.com" } } dependencies { 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") runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") + + runtimeOnly fg.deobf("curse.maven:TOP-245211:3319255") } // not sure if this is still needed diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b23e6b8ff..82df05bac 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -346,7 +346,6 @@ c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_qu 6c045ca364ea3483083fe3be01f15508d485402a data/actuallyadditions/recipes/black_quartz_slab.json f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json -26ac845ea63340266591b88f0008dfe7c84d901f data/actuallyadditions/recipes/bone_crusher.json 398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json 9840b640a62e061baaecc74efd1e7455c59b35e9 data/actuallyadditions/recipes/boots_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 9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json +b76b843a60a1c456a11d3bb932a93ab3753d6f58 data/actuallyadditions/recipes/crushing/bone_crusher.json bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json 4fea2c334ed0e5a3ee2d93d570a576d230637242 data/actuallyadditions/recipes/diamatine_axe.json 4a7fe43b6202d8e46c1c9dd16fd1ea7039c25d4a data/actuallyadditions/recipes/diamatine_boots.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/bone_crusher.json b/src/generated/resources/data/actuallyadditions/recipes/crushing/bone_crusher.json similarity index 71% rename from src/generated/resources/data/actuallyadditions/recipes/bone_crusher.json rename to src/generated/resources/data/actuallyadditions/recipes/crushing/bone_crusher.json index d38db2a93..d754a200a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/bone_crusher.json +++ b/src/generated/resources/data/actuallyadditions/recipes/crushing/bone_crusher.json @@ -4,10 +4,13 @@ "item": "minecraft:bone" }, "result": [ + { + "item": "minecraft:bone_meal", + "chance": 1.0 + }, { "item": "minecraft:air", "chance": 0.0 - }, - {} + } ] } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java index c67608605..7a6a2ebde 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java @@ -26,7 +26,7 @@ public class CrushingRecipeGenerator extends RecipeProvider { @Override protected void buildShapelessRecipes(Consumer 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)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java index 5bf040bc5..1b14edeb3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java @@ -181,8 +181,8 @@ public class CrushingRecipe implements IRecipe { result1.addProperty("chance", outputChance1); JsonObject result2 = new JsonObject(); - result1.addProperty("item", outputTwo.asItem().getRegistryName().toString()); - result1.addProperty("chance", outputChance2); + result2.addProperty("item", outputTwo.asItem().getRegistryName().toString()); + result2.addProperty("chance", outputChance2); JsonArray resultList = new JsonArray(); resultList.add(result1); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index 64d1538c2..f8bbbc981 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -75,7 +75,7 @@ public class ItemSolidifiedExperience extends ItemBase { orb.getPersistentData().putBoolean(ActuallyAdditions.MODID + "FromSolidified", true); world.addFreshEntity(orb); } else { - player.giveExperienceLevels(amount); + player.giveExperiencePoints(amount); } } return ActionResult.success(stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 722614f41..2da1e53a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -118,7 +118,7 @@ public class ItemWingsOfTheBats extends ItemBase { if (event.getEntityLiving() instanceof PlayerEntity) { 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); if (!player.level.isClientSide) {