Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add stairsRecipeName #2435

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Add stairsRecipeName #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/main/java/gregtech/loaders/WoodTypeEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public final class WoodTypeEntry {
public final String fenceGateRecipeName;
@NotNull
public final ItemStack stairs;
@Nullable
public final String stairsRecipeName;
public final boolean addStairsCraftingRecipe;
@NotNull
public final ItemStack boat;
Expand Down Expand Up @@ -83,13 +85,14 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull
@NotNull ItemStack slab, @Nullable String slabRecipeName, boolean addSlabCraftingRecipe,
@NotNull ItemStack fence, @Nullable String fenceRecipeName,
@NotNull ItemStack fenceGate, @Nullable String fenceGateRecipeName, @NotNull ItemStack stairs,
boolean addStairsCraftingRecipe, @NotNull ItemStack boat, @Nullable String boatRecipeName,
@Nullable Material material, boolean addLogOreDict, boolean addPlanksOreDict,
boolean addDoorsOreDict, boolean addSlabsOreDict, boolean addFencesOreDict,
boolean addFenceGatesOreDict, boolean addStairsOreDict, boolean addPlanksUnificationInfo,
boolean addDoorsUnificationInfo, boolean addSlabsUnificationInfo,
boolean addFencesUnificationInfo, boolean addFenceGatesUnificationInfo,
boolean addStairsUnificationInfo, boolean addBoatsUnificationInfo) {
@Nullable String stairsRecipeName, boolean addStairsCraftingRecipe, @NotNull ItemStack boat,
@Nullable String boatRecipeName, @Nullable Material material, boolean addLogOreDict,
boolean addPlanksOreDict, boolean addDoorsOreDict, boolean addSlabsOreDict,
boolean addFencesOreDict, boolean addFenceGatesOreDict, boolean addStairsOreDict,
boolean addPlanksUnificationInfo, boolean addDoorsUnificationInfo,
boolean addSlabsUnificationInfo, boolean addFencesUnificationInfo,
boolean addFenceGatesUnificationInfo, boolean addStairsUnificationInfo,
boolean addBoatsUnificationInfo) {
this.modid = modid;
this.woodName = woodName;
this.log = log;
Expand All @@ -107,6 +110,7 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull
this.fenceGate = fenceGate;
this.fenceGateRecipeName = fenceGateRecipeName;
this.stairs = stairs;
this.stairsRecipeName = stairsRecipeName;
this.addStairsCraftingRecipe = addStairsCraftingRecipe;
this.boat = boat;
this.boatRecipeName = boatRecipeName;
Expand Down Expand Up @@ -153,6 +157,7 @@ public static class Builder {
private ItemStack fenceGate = ItemStack.EMPTY;
private String fenceGateRecipeName;
private ItemStack stairs = ItemStack.EMPTY;
private String stairsRecipeName;
private boolean addStairsCraftingRecipe;
private ItemStack boat = ItemStack.EMPTY;
private String boatRecipeName;
Expand Down Expand Up @@ -294,11 +299,13 @@ public Builder fenceGate(@NotNull ItemStack fenceGate, @Nullable String fenceGat
/**
* Add an entry for stairs
*
* @param stairs the stairs to add
* @param stairs the stairs to add
* @param stairsRecipeName the recipe name for crafting the stairs
* @return this
*/
public Builder stairs(@NotNull ItemStack stairs) {
public Builder stairs(@NotNull ItemStack stairs, @Nullable String stairsRecipeName) {
this.stairs = stairs;
this.stairsRecipeName = stairsRecipeName;
return this;
}

Expand Down Expand Up @@ -410,12 +417,11 @@ public WoodTypeEntry build() {
Preconditions.checkArgument(!planks.isEmpty(), "Planks cannot be empty.");
return new WoodTypeEntry(modid, woodName, log, removeCharcoalRecipe, addCharcoalRecipe, planks,
planksRecipeName, door, doorRecipeName, slab, slabRecipeName, addSlabsCraftingRecipe, fence,
fenceRecipeName,
fenceGate, fenceGateRecipeName, stairs, addStairsCraftingRecipe, boat, boatRecipeName, material,
addLogOreDict, addPlanksOreDict, addDoorsOreDict, addSlabsOreDict, addFencesOreDict,
addFenceGatesOreDict, addStairsOreDict, addPlanksUnificationInfo, addDoorsUnificationInfo,
addSlabsUnificationInfo, addFencesUnificationInfo, addFenceGatesUnificationInfo,
addStairsUnificationInfo, addBoatsUnificationInfo);
fenceRecipeName, fenceGate, fenceGateRecipeName, stairs, stairsRecipeName, addStairsCraftingRecipe,
boat, boatRecipeName, material, addLogOreDict, addPlanksOreDict, addDoorsOreDict, addSlabsOreDict,
addFencesOreDict, addFenceGatesOreDict, addStairsOreDict, addPlanksUnificationInfo,
addDoorsUnificationInfo, addSlabsUnificationInfo, addFencesUnificationInfo,
addFenceGatesUnificationInfo, addStairsUnificationInfo, addBoatsUnificationInfo);
}
}
}
20 changes: 11 additions & 9 deletions src/main/java/gregtech/loaders/recipe/WoodRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB), "oak_wooden_slab")
.fence(new ItemStack(Blocks.OAK_FENCE), "fence")
.fenceGate(new ItemStack(Blocks.OAK_FENCE_GATE), "fence_gate")
.stairs(new ItemStack(Blocks.OAK_STAIRS))
.stairs(new ItemStack(Blocks.OAK_STAIRS), "oak_stairs")
.boat(new ItemStack(Items.BOAT), "boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -60,7 +60,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB, 1, 1), "spruce_wooden_slab")
.fence(new ItemStack(Blocks.SPRUCE_FENCE), "spruce_fence")
.fenceGate(new ItemStack(Blocks.SPRUCE_FENCE_GATE), "spruce_fence_gate")
.stairs(new ItemStack(Blocks.SPRUCE_STAIRS))
.stairs(new ItemStack(Blocks.SPRUCE_STAIRS), "spruce_stairs")
.boat(new ItemStack(Items.SPRUCE_BOAT), "spruce_boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -71,7 +71,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB, 1, 2), "birch_wooden_slab")
.fence(new ItemStack(Blocks.BIRCH_FENCE), "birch_fence")
.fenceGate(new ItemStack(Blocks.BIRCH_FENCE_GATE), "birch_fence_gate")
.stairs(new ItemStack(Blocks.BIRCH_STAIRS))
.stairs(new ItemStack(Blocks.BIRCH_STAIRS), "birch_stairs")
.boat(new ItemStack(Items.BIRCH_BOAT), "birch_boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -82,7 +82,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB, 1, 3), "jungle_wooden_slab")
.fence(new ItemStack(Blocks.JUNGLE_FENCE), "jungle_fence")
.fenceGate(new ItemStack(Blocks.JUNGLE_FENCE_GATE), "jungle_fence_gate")
.stairs(new ItemStack(Blocks.JUNGLE_STAIRS))
.stairs(new ItemStack(Blocks.JUNGLE_STAIRS), "jungle_stairs")
.boat(new ItemStack(Items.JUNGLE_BOAT), "jungle_boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -93,7 +93,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB, 1, 4), "acacia_wooden_slab")
.fence(new ItemStack(Blocks.ACACIA_FENCE), "acacia_fence")
.fenceGate(new ItemStack(Blocks.ACACIA_FENCE_GATE), "acacia_fence_gate")
.stairs(new ItemStack(Blocks.ACACIA_STAIRS))
.stairs(new ItemStack(Blocks.ACACIA_STAIRS), "acacia_stairs")
.boat(new ItemStack(Items.ACACIA_BOAT), "acacia_boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -104,7 +104,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(Blocks.WOODEN_SLAB, 1, 5), "dark_oak_wooden_slab")
.fence(new ItemStack(Blocks.DARK_OAK_FENCE), "dark_oak_fence")
.fenceGate(new ItemStack(Blocks.DARK_OAK_FENCE_GATE), "dark_oak_fence_gate")
.stairs(new ItemStack(Blocks.DARK_OAK_STAIRS))
.stairs(new ItemStack(Blocks.DARK_OAK_STAIRS), "dark_oak_stairs")
.boat(new ItemStack(Items.DARK_OAK_BOAT), "dark_oak_boat")
.registerAllUnificationInfo()
.build(),
Expand All @@ -115,7 +115,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(MetaBlocks.WOOD_SLAB), null).addSlabRecipe()
.fence(new ItemStack(MetaBlocks.RUBBER_WOOD_FENCE), null)
.fenceGate(new ItemStack(MetaBlocks.RUBBER_WOOD_FENCE_GATE), null)
.stairs(new ItemStack(MetaBlocks.RUBBER_WOOD_STAIRS)).addStairsRecipe()
.stairs(new ItemStack(MetaBlocks.RUBBER_WOOD_STAIRS), null).addStairsRecipe()
.boat(MetaItems.RUBBER_WOOD_BOAT.getStackForm(), null)
.registerAllOres()
.registerAllUnificationInfo()
Expand All @@ -126,7 +126,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
.slab(new ItemStack(MetaBlocks.WOOD_SLAB, 1, 1), null).addSlabRecipe()
.fence(new ItemStack(MetaBlocks.TREATED_WOOD_FENCE), null)
.fenceGate(new ItemStack(MetaBlocks.TREATED_WOOD_FENCE_GATE), null)
.stairs(new ItemStack(MetaBlocks.TREATED_WOOD_STAIRS)).addStairsRecipe()
.stairs(new ItemStack(MetaBlocks.TREATED_WOOD_STAIRS), null).addStairsRecipe()
.boat(MetaItems.TREATED_WOOD_BOAT.getStackForm(), null)
.material(TreatedWood)
.registerAllOres()
Expand Down Expand Up @@ -326,8 +326,10 @@ public static void registerWoodTypeRecipe(@NotNull WoodTypeEntry entry) {

// stairs
if (!entry.stairs.isEmpty()) {
final boolean hasStairRecipe = entry.stairsRecipeName != null;
if (entry.addStairsCraftingRecipe) {
ModHandler.addShapedRecipe(name + "_stairs", GTUtility.copy(4, entry.stairs),
ModHandler.addShapedRecipe(hasStairRecipe ? entry.stairsRecipeName : name + "_stairs",
GTUtility.copy(4, entry.stairs),
"P ", "PP ", "PPP",
'P', entry.planks.copy());
}
Expand Down
Loading