-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7757eca
commit 405fe0a
Showing
117 changed files
with
96 additions
and
1,405 deletions.
There are no files selected for viewing
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanBlackDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlackDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanBlackDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanBlackDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanBlackDyeingEmiRecipe(BlackDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_BLACK_DYEING, recipe, GarnishedFluids.BLACK_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanBrownDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.BrownDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanBrownDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanBrownDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanBrownDyeingEmiRecipe(BrownDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_BROWN_DYEING, recipe, GarnishedFluids.BROWN_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanCyanDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.CyanDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanCyanDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanCyanDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanCyanDyeingEmiRecipe(CyanDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_CYAN_DYEING, recipe, GarnishedFluids.CYAN_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanGrayDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.GrayDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanGrayDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanGrayDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanGrayDyeingEmiRecipe(GrayDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_GRAY_DYEING, recipe, GarnishedFluids.GRAY_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanLightBlueDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.LightBlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanLightBlueDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanLightBlueDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanLightBlueDyeingEmiRecipe(LightBlueDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_LIGHT_BLUE_DYEING, recipe, GarnishedFluids.LIGHT_BLUE_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanLightGrayDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.LightGrayDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanLightGrayDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanLightGrayDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanLightGrayDyeingEmiRecipe(LightGrayDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_LIGHT_GRAY_DYEING, recipe, GarnishedFluids.LIGHT_GRAY_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanLimeDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.LimeDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanLimeDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanLimeDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanLimeDyeingEmiRecipe(LimeDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_LIME_DYEING, recipe, GarnishedFluids.LIME_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanMagentaDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.MagentaDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanMagentaDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanMagentaDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanMagentaDyeingEmiRecipe(MagentaDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_MAGENTA_DYEING, recipe, GarnishedFluids.MAGENTA_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanPinkDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.PinkDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanPinkDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanPinkDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanPinkDyeingEmiRecipe(PinkDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_PINK_DYEING, recipe, GarnishedFluids.PINK_MASTIC_RESIN.getSource()); | ||
} | ||
} |
3 changes: 2 additions & 1 deletion
3
src/main/java/net/dakotapride/garnished/registry/EMI/FanWhiteDyeingEmiRecipe.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
package net.dakotapride.garnished.registry.EMI; | ||
|
||
import net.dakotapride.garnished.recipe.BlueDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.recipe.WhiteDyeBlowingFanRecipe; | ||
import net.dakotapride.garnished.registry.GarnishedFluids; | ||
|
||
public class FanWhiteDyeingEmiRecipe extends FanDyeingEmiRecipe { | ||
public FanWhiteDyeingEmiRecipe(BlueDyeBlowingFanRecipe recipe) { | ||
public FanWhiteDyeingEmiRecipe(WhiteDyeBlowingFanRecipe recipe) { | ||
super(GarnishedEMI.FAN_WHITE_DYEING, recipe, GarnishedFluids.WHITE_MASTIC_RESIN.getSource()); | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/resources/assets/garnished/blockstates/cyan_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "garnished:block/cyan_mastic_resin" | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/resources/assets/garnished/blockstates/light_blue_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "garnished:block/light_blue_mastic_resin" | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/resources/assets/garnished/blockstates/lime_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "garnished:block/lime_mastic_resin" | ||
} | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/garnished/models/block/black_smooth_zultanite_stairs_inner.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "minecraft:block/inner_stairs", | ||
"textures": { | ||
"bottom": "garnished:block/black_smooth_zultanite", | ||
"side": "garnished:block/black_smooth_zultanite", | ||
"top": "garnished:block/black_smooth_zultanite" | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/garnished/models/block/black_smooth_zultanite_stairs_outer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "minecraft:block/outer_stairs", | ||
"textures": { | ||
"bottom": "garnished:block/black_smooth_zultanite", | ||
"side": "garnished:block/black_smooth_zultanite", | ||
"top": "garnished:block/black_smooth_zultanite" | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/garnished/models/block/cyan_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"textures": { | ||
"particle": "garnished:fluid/cyan_mastic_resin_still" | ||
} | ||
} | ||
|
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/garnished/models/block/lime_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"textures": { | ||
"particle": "garnished:fluid/lime_mastic_resin_still" | ||
} | ||
} | ||
|
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/garnished/models/block/purple_smooth_zultanite_slab_top.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "minecraft:block/slab_top", | ||
"textures": { | ||
"bottom": "garnished:block/purple_smooth_zultanite", | ||
"side": "garnished:block/purple_smooth_zultanite", | ||
"top": "garnished:block/purple_smooth_zultanite" | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/garnished/models/block/white_mastic_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"textures": { | ||
"particle": "garnished:fluid/white_mastic_resin_still" | ||
} | ||
} | ||
|
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/blue/blue_seat.json
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/green/green_seat.json
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/orange/orange_seat.json
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/purple/purple_seat.json
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/red/red_seat.json
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
src/main/resources/data/garnished/recipes/dye_blowing/create/yellow/yellow_seat.json
This file was deleted.
Oops, something went wrong.
22 changes: 0 additions & 22 deletions
22
...in/resources/data/garnished/recipes/dye_blowing/farmersdelight/blue/blue_canvas_sign.json
This file was deleted.
Oops, something went wrong.
22 changes: 0 additions & 22 deletions
22
.../resources/data/garnished/recipes/dye_blowing/farmersdelight/green/green_canvas_sign.json
This file was deleted.
Oops, something went wrong.
22 changes: 0 additions & 22 deletions
22
...esources/data/garnished/recipes/dye_blowing/farmersdelight/orange/orange_canvas_sign.json
This file was deleted.
Oops, something went wrong.
22 changes: 0 additions & 22 deletions
22
...esources/data/garnished/recipes/dye_blowing/farmersdelight/purple/purple_canvas_sign.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.