Skip to content

Commit

Permalink
Add clay tag
Browse files Browse the repository at this point in the history
  • Loading branch information
NovaMachina committed Nov 11, 2020
1 parent f0c6820 commit 86ca6d1
Show file tree
Hide file tree
Showing 565 changed files with 178 additions and 8,502 deletions.
Expand Up @@ -19,6 +19,7 @@ public class ExNihiloTags {
public static final ITag.INamedTag<Item> MEAT_UNCOOKED = createItemWrapper(forgeLoc("meat_uncooked"));
public static final ITag.INamedTag<Item> MEAT_COOKED = createItemWrapper(forgeLoc("meat_cooked"));
public static final ITag.INamedTag<Item> HAMMER = createItemWrapper(new ResourceLocation(Constants.ModIds.EX_NIHILO_SEQUENTIA, "hammer"));
public static final ITag.INamedTag<Item> CLAY = createItemWrapper(forgeLoc("clay"));

static {
for(EnumOre ore : EnumOre.values()) {
Expand Down
Expand Up @@ -24,6 +24,11 @@ protected void registerTags() {
registerSeeds();
registerMeats();
registerHammers();
registerMisc();
}

private void registerMisc() {
getOrCreateBuilder(ExNihiloTags.CLAY).addItemEntry(Items.CLAY_BALL);
}

private void registerHammers() {
Expand Down
Expand Up @@ -22,6 +22,7 @@
import com.novamachina.exnihilosequentia.common.item.seeds.EnumSeed;
import com.novamachina.exnihilosequentia.common.item.tools.crook.EnumCrook;
import com.novamachina.exnihilosequentia.common.item.tools.hammer.EnumHammer;
import com.novamachina.exnihilosequentia.common.registries.defaults.ExNihilo;
import com.novamachina.exnihilosequentia.common.tileentity.crucible.CrucilbeTypeEnum;
import com.novamachina.exnihilosequentia.common.utility.Constants;
import net.minecraft.advancements.criterion.InventoryChangeTrigger;
Expand Down Expand Up @@ -628,7 +629,7 @@ private void registerMisc(Consumer<IFinishedRecipe> consumer) {
.build(consumer);

ShapelessRecipeBuilder.shapelessRecipe(EnumResource.PORCELAIN_CLAY.getRegistryObject().get())
.addIngredient(Items.CLAY_BALL)
.addIngredient(ExNihiloTags.CLAY)
.addIngredient(Items.BONE_MEAL)
.addCriterion("has_clay", InventoryChangeTrigger.Instance.forItems(Items.CLAY_BALL))
.build(consumer);
Expand Down
Expand Up @@ -345,7 +345,7 @@ d6a1b4db958877a3367fa9ceaf54ed60f500b25d data/exnihilosequentia/recipes/mesh_dia
20334de80b242ca5731b534a90eed3f842d960d2 data/exnihilosequentia/recipes/mesh_flint.json
f1d09d6e6be00eb7a26867dfe1a052fa5c9872cb data/exnihilosequentia/recipes/mesh_iron.json
4339007d439f47bbc66523dfb466f4c3f97eaf11 data/exnihilosequentia/recipes/mesh_string.json
958666d1b2467957fc639618d1bbec42c8e660f3 data/exnihilosequentia/recipes/porcelain_clay.json
12bd97fdeb1e0acf3b5afb292f3791531fbf7e99 data/exnihilosequentia/recipes/porcelain_clay.json
cd54f956ab4fa527f7839a6ad12996062be99e3a data/exnihilosequentia/recipes/sieve/acacia_leaves.json
69c9102a102a742ef77e06933edcbdcc342bcaa6 data/exnihilosequentia/recipes/sieve/ancient_spore.json
5a03aa57c8f5c96d586763dc97966cc89663901d data/exnihilosequentia/recipes/sieve/apple.json
Expand Down Expand Up @@ -413,6 +413,7 @@ a3d4a8a6b7b86dc6a988b1c06ac63cf3e937a872 data/exnihilosequentia/recipes/sieve/se
82eb95aca11b0039e2e74efbf5d9bf08736762f7 data/exnihilosequentia/recipes/sieve/silkworm.json
9fef1f967c323c3d7a010cb13d9710920b56ab1c data/exnihilosequentia/recipes/sieve/spruce_leaves.json
9714543df87a6687257c7d222531ac655092ce01 data/exnihilosequentia/tags/items/hammer.json
53f4c156730d64dc71bca7aae03c2ee3e05845bf data/forge/tags/items/clay.json
d9e1b2f729a26b583c6c6f90303bd2108124d957 data/forge/tags/items/ingots.json
f8c2cbce92d834dab94bd961806ce07b8a8c5ee9 data/forge/tags/items/ingots/aluminum.json
61aee30408a556ec64d254b1a72eddbd5e2506a2 data/forge/tags/items/ingots/copper.json
Expand Down
Expand Up @@ -22,4 +22,4 @@
"model": "exnihilosequentia:block/cake_slice6"
}
}
}
}
Expand Up @@ -4,4 +4,4 @@
"model": "exnihilosequentia:block/sea_water"
}
}
}
}
Expand Up @@ -4,4 +4,4 @@
"model": "exnihilosequentia:block/witchwater"
}
}
}
}
@@ -1,157 +1,7 @@
{
"parent": "minecraft:block/block",
"parent": "exnihilosequentia:block/barrel",
"textures": {
"particle": "minecraft:block/stone",
"texture": "minecraft:block/stone"
},
"elements": [
{
"from": [
1,
1,
1
],
"to": [
15,
16,
2
],
"faces": {
"up": {
"texture": "#texture"
},
"north": {
"texture": "#texture"
},
"south": {
"texture": "#texture"
},
"west": {
"texture": "#texture"
},
"east": {
"texture": "#texture"
}
}
},
{
"from": [
1,
1,
1
],
"to": [
2,
16,
15
],
"faces": {
"up": {
"texture": "#texture"
},
"north": {
"texture": "#texture"
},
"south": {
"texture": "#texture"
},
"west": {
"texture": "#texture"
},
"east": {
"texture": "#texture"
}
}
},
{
"from": [
1,
1,
14
],
"to": [
15,
16,
15
],
"faces": {
"up": {
"texture": "#texture"
},
"north": {
"texture": "#texture"
},
"south": {
"texture": "#texture"
},
"west": {
"texture": "#texture"
},
"east": {
"texture": "#texture"
}
}
},
{
"from": [
14,
1,
1
],
"to": [
15,
16,
15
],
"faces": {
"up": {
"texture": "#texture"
},
"north": {
"texture": "#texture"
},
"south": {
"texture": "#texture"
},
"west": {
"texture": "#texture"
},
"east": {
"texture": "#texture"
}
}
},
{
"from": [
1,
0,
1
],
"to": [
15,
1,
15
],
"faces": {
"up": {
"texture": "#texture"
},
"down": {
"texture": "#texture"
},
"north": {
"texture": "#texture"
},
"south": {
"texture": "#texture"
},
"west": {
"texture": "#texture"
},
"east": {
"texture": "#texture"
}
}
}
]
"texture": "minecraft:block/stone",
"particle": "minecraft:block/stone"
}
}

0 comments on commit 86ca6d1

Please sign in to comment.