Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some more stray errors

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-05-18 23:46:11 +01:00
parent 135810c343
commit 92b6288ca1
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexLootTables.java
View file

@ -51,7 +51,7 @@ public class HexLootTables extends PaucalLootTableProvider {
HexBlocks.AKASHIC_PLANKS, HexBlocks.AKASHIC_TILE, HexBlocks.AKASHIC_PANEL,
HexBlocks.AKASHIC_TRAPDOOR, HexBlocks.AKASHIC_STAIRS, HexBlocks.AKASHIC_PRESSURE_PLATE, HexBlocks.AKASHIC_BUTTON);
makeSlabTable(lootTables, HexBlocks.AKASHIC_SLAB.get());
makeSlabTable(lootTables, HexBlocks.AKASHIC_SLAB);
makeLeafTable(lootTables, HexBlocks.AKASHIC_LEAVES1);
makeLeafTable(lootTables, HexBlocks.AKASHIC_LEAVES2);

11
Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexRecipes.java
View file

@ -165,11 +165,7 @@ public class HexRecipes extends PaucalRecipeProvider {
.pattern("SSS")
.unlockedBy("has_item", has(HexItems.AMETHYST_DUST)).save(recipes);
<<<<<<< HEAD:Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexRecipes.java
ShapedRecipeBuilder.shaped(HexBlocks.SLATE_BLOCK)
.define('S', HexItems.SLATE)
=======
ShapedRecipeBuilder.shaped(HexItems.JEWELER_HAMMER.get())
ShapedRecipeBuilder.shaped(HexItems.JEWELER_HAMMER)
.define('I', Items.IRON_INGOT)
.define('N', Items.IRON_NUGGET)
.define('A', Items.AMETHYST_SHARD)
@ -179,9 +175,8 @@ public class HexRecipes extends PaucalRecipeProvider {
.pattern(" S ")
.unlockedBy("has_item", has(Items.AMETHYST_SHARD)).save(recipes);
ShapedRecipeBuilder.shaped(HexBlocks.SLATE_BLOCK.get())
.define('S', HexItems.SLATE.get())
>>>>>>> 65b04c03 (jeweler's hammer):src/main/java/at/petrak/hexcasting/datagen/HexRecipes.java
ShapedRecipeBuilder.shaped(HexBlocks.SLATE_BLOCK)
.define('S', HexItems.SLATE)
.pattern("S")
.pattern("S")
.unlockedBy("has_item", has(HexItems.SLATE))