Browse Source

Cloud parachutes are now properly separated by ID, fixes issue #406

Added recipe advancements for all of the Aether's crafting recipes. This will make them show up in the recipe book when you get the ingredients.

Grouped some recipes together so that they would show up together in the recipe book, just like how different wood types and wool colors do in vanilla.

Fixed a crash caused by the therawood decorative blocks in the ore dictionary.
1.12.2
Archie 4 months ago
parent
commit
ba39144d64
39 changed files with 43 additions and 10 deletions
  1. +1
    -1
      src/main/java/com/gildedgames/aether/common/init/RecipesAether.java
  2. +5
    -9
      src/main/java/com/gildedgames/aether/common/items/consumables/ItemCloudParachute.java
  3. +1
    -0
      src/main/resources/assets/aether/recipes/construction/dark_skyroot_planks.json
  4. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_button.json
  5. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_fence.json
  6. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_fence_gate.json
  7. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_log_wall.json
  8. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_pressure_plate.json
  9. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_slab.json
  10. +1
    -0
      src/main/resources/assets/aether/recipes/construction/greatroot_stairs.json
  11. +1
    -0
      src/main/resources/assets/aether/recipes/construction/holystone_bookshelf.json
  12. +1
    -0
      src/main/resources/assets/aether/recipes/construction/light_skyroot_planks.json
  13. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_bookshelf.json
  14. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_button.json
  15. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_door.json
  16. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_fence.json
  17. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_fence_gate.json
  18. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_log_wall.json
  19. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_planks.json
  20. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_pressure_plate.json
  21. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_slab.json
  22. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_stairs.json
  23. +1
    -0
      src/main/resources/assets/aether/recipes/construction/skyroot_trapdoor.json
  24. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_fence.json
  25. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_fence_gate.json
  26. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_log_wall.json
  27. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_planks.json
  28. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_slab.json
  29. +1
    -0
      src/main/resources/assets/aether/recipes/construction/therawood_stairs.json
  30. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_button.json
  31. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_fence.json
  32. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_fence_gate.json
  33. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_log_wall.json
  34. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_pressure_plate.json
  35. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_slab.json
  36. +1
    -0
      src/main/resources/assets/aether/recipes/construction/wisproot_stairs.json
  37. +1
    -0
      src/main/resources/assets/aether/recipes/consumables/blue_swet_jelly.json
  38. +1
    -0
      src/main/resources/assets/aether/recipes/consumables/green_swet_jelly.json
  39. +1
    -0
      src/main/resources/assets/aether/recipes/consumables/purple_swet_jelly.json

+ 1
- 1
src/main/java/com/gildedgames/aether/common/init/RecipesAether.java View File

@@ -88,7 +88,7 @@ public class RecipesAether

OreDictionary.registerOre("greatroot_decorative", new ItemStack(BlocksAether.dark_skyroot_beam, 1));

for (BlockVariant variant : BlockSkyrootDecorative.PROPERTY_VARIANT.getAllowedValues())
for (BlockVariant variant : BlockTherawoodDecorative.PROPERTY_VARIANT.getAllowedValues())
{
OreDictionary.registerOre("therawood_decorative", new ItemStack(BlocksAether.therawood_decorative, 1, variant.getMeta()));
}


+ 5
- 9
src/main/java/com/gildedgames/aether/common/items/consumables/ItemCloudParachute.java View File

@@ -27,20 +27,16 @@ public class ItemCloudParachute extends Item implements IDropOnDeath
public ItemCloudParachute()
{
this.maxStackSize = 1;
this.setHasSubtypes(true);
}

@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final CreativeTabs tab, final NonNullList<ItemStack> subItems)
{
if (!this.isInCreativeTab(tab))
{
return;
}

for (final EntityParachute.Type types : EntityParachute.Type.values())
{
subItems.add(new ItemStack(this, 1, types.ordinal()));
if (this.isInCreativeTab(tab)) {
for(int i = 0; i < 3; ++i) {
subItems.add(new ItemStack(this, 1, i));
}
}
}



+ 1
- 0
src/main/resources/assets/aether/recipes/construction/dark_skyroot_planks.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:planks",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_button.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_button",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_fence.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence",
"pattern": [
"W#W",
"W#W"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_fence_gate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence_gate",
"pattern": [
"#W#",
"#W#"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_log_wall.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:log_wall",
"pattern": [
" ",
"###",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_pressure_plate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_pressure_plate",
"pattern": [
"XX "
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_slab.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_slab",
"pattern": [
"XXX"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/greatroot_stairs.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_stairs",
"pattern": [
"X ",
"XX ",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/holystone_bookshelf.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:bookshelf",
"pattern": [
"###",
"XXX",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/light_skyroot_planks.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:planks",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_bookshelf.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:bookshelf",
"pattern": [
"###",
"XXX",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_button.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_button",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_door.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_door",
"pattern": [
"XX",
"XX",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_fence.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence",
"pattern": [
"W#W",
"W#W"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_fence_gate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence_gate",
"pattern": [
"#W#",
"#W#"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_log_wall.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:log_wall",
"pattern": [
" ",
"###",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_planks.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:planks",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_pressure_plate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_pressure_plate",
"pattern": [
"XX "
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_slab.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_slab",
"pattern": [
"XXX"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_stairs.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_stairs",
"pattern": [
"X ",
"XX ",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/skyroot_trapdoor.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_trapdoor",
"pattern": [
"XXX",
"XXX"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_fence.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence",
"pattern": [
"W#W",
"W#W"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_fence_gate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence_gate",
"pattern": [
"#W#",
"#W#"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_log_wall.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:log_wall",
"pattern": [
" ",
"###",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_planks.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:planks",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_slab.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_slab",
"pattern": [
"XXX"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/therawood_stairs.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_stairs",
"pattern": [
"X ",
"XX ",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_button.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_button",
"pattern": [
"X"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_fence.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence",
"pattern": [
"W#W",
"W#W"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_fence_gate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_fence_gate",
"pattern": [
"#W#",
"#W#"


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_log_wall.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:log_wall",
"pattern": [
" ",
"###",


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_pressure_plate.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shaped",
"group": "aether:wooden_pressure_plate",
"pattern": [
"XX "
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_slab.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_slab",
"pattern": [
"XXX"
],


+ 1
- 0
src/main/resources/assets/aether/recipes/construction/wisproot_stairs.json View File

@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "aether:wooden_stairs",
"pattern": [
"X ",
"XX ",


+ 1
- 0
src/main/resources/assets/aether/recipes/consumables/blue_swet_jelly.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shapeless",
"group": "aether:swet_jelly",
"ingredients": [
{
"item": "aether:swet_gel",


+ 1
- 0
src/main/resources/assets/aether/recipes/consumables/green_swet_jelly.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shapeless",
"group": "aether:swet_jelly",
"ingredients": [
{
"item": "aether:swet_gel",


+ 1
- 0
src/main/resources/assets/aether/recipes/consumables/purple_swet_jelly.json View File

@@ -1,5 +1,6 @@
{
"type": "forge:ore_shapeless",
"group": "aether:swet_jelly",
"ingredients": [
{
"item": "aether:swet_gel",


Loading…
Cancel
Save