Skip to content

Commit

Permalink
v1.9 - minor adjustments + fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DakotaPride
DakotaPride committed Jul 26, 2024
1 parent 852f0b7 commit b7cb997
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 34 deletions.
91 changes: 63 additions & 28 deletions src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,36 +269,71 @@ public static BlockState whenFluidsMeet(LevelAccessor world, BlockPos pos, Block

@Nullable
public static BlockState getLavaInteraction(FluidState fluidState) {
Fluid fluid = fluidState.getType();
if (fluid.isSame(GARNISH.get()))
return AllPaletteStoneTypes.CALCITE.getBaseBlock()
.get()
.defaultBlockState();
if (fluid.isSame(APPLE_CIDER.get()))
return AllPaletteStoneTypes.OCHRUM.getBaseBlock()
.get()
.defaultBlockState();
if (fluid.isSame(PEANUT_OIL.get()))
return AllPaletteStoneTypes.DRIPSTONE.getBaseBlock()
.get()
.defaultBlockState();
if (fluid.isSame(CASHEW_MIXTURE.get()))
// Fluids.lavaInteraction(fluidState, GARNISH.get(), AllPaletteStoneTypes.CALCITE.getBaseBlock().get());
if (fluidState.is(GARNISH.get()))
return AllPaletteStoneTypes.CALCITE.getBaseBlock().get().defaultBlockState();
// Fluids.lavaInteraction(fluidState, PEANUT_OIL.get(), AllPaletteStoneTypes.DRIPSTONE.getBaseBlock().get());
if (fluidState.is(PEANUT_OIL.get()))
return AllPaletteStoneTypes.DRIPSTONE.getBaseBlock().get().defaultBlockState();
// Fluids.lavaInteraction(fluidState, APPLE_CIDER.get(), GarnishedBlocks.CARNOTITE.get());
if (fluidState.is(APPLE_CIDER.get()))
return GarnishedBlocks.CARNOTITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, CASHEW_MIXTURE.get(), Blocks.END_STONE);
if (fluidState.is(PEANUT_OIL.get()))
return Blocks.END_STONE.defaultBlockState();

if (fluid.isSame(MASTIC_RESIN.get()))
return AllPaletteStoneTypes.TUFF.getBaseBlock().get().defaultBlockState();
if (fluid.isSame(RED_MASTIC_RESIN.get()))
return AllPaletteStoneTypes.CRIMSITE.getBaseBlock().get().defaultBlockState();
if (fluid.isSame(ORANGE_MASTIC_RESIN.get()))
return GarnishedBlocks.RITUALISTIC_STONE.get().defaultBlockState();
if (fluid.isSame(YELLOW_MASTIC_RESIN.get()))
return GarnishedBlocks.CARNOTITE.get().defaultBlockState();
if (fluid.isSame(GREEN_MASTIC_RESIN.get()))
return AllPaletteStoneTypes.VERIDIUM.getBaseBlock().get().defaultBlockState();
if (fluid.isSame(BLUE_MASTIC_RESIN.get()))
return AllPaletteStoneTypes.ASURINE.getBaseBlock().get().defaultBlockState();
if (fluid.isSame(PURPLE_MASTIC_RESIN.get()))
return GarnishedBlocks.ABYSSAL_STONE.get().defaultBlockState();
// Fluids.lavaInteraction(fluidState, MASTIC_RESIN.get(), GarnishedBlocks.ZULTANITE.get());
if (fluidState.is(MASTIC_RESIN.get()))
return GarnishedBlocks.ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, RED_MASTIC_RESIN.get(), GarnishedBlocks.RED_ZULTANITE.get());
if (fluidState.is(RED_MASTIC_RESIN.get()))
return GarnishedBlocks.RED_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, ORANGE_MASTIC_RESIN.get(), GarnishedBlocks.ORANGE_ZULTANITE.get());
if (fluidState.is(ORANGE_MASTIC_RESIN.get()))
return GarnishedBlocks.ORANGE_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, YELLOW_MASTIC_RESIN.get(), GarnishedBlocks.YELLOW_ZULTANITE.get());
if (fluidState.is(YELLOW_MASTIC_RESIN.get()))
return GarnishedBlocks.YELLOW_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, GREEN_MASTIC_RESIN.get(), GarnishedBlocks.GREEN_ZULTANITE.get());
if (fluidState.is(GREEN_MASTIC_RESIN.get()))
return GarnishedBlocks.GREEN_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, LIME_MASTIC_RESIN.get(), GarnishedBlocks.LIME_ZULTANITE.get());
if (fluidState.is(LIME_MASTIC_RESIN.get()))
return GarnishedBlocks.LIME_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, BLUE_MASTIC_RESIN.get(), GarnishedBlocks.BLUE_ZULTANITE.get());
if (fluidState.is(BLUE_MASTIC_RESIN.get()))
return GarnishedBlocks.BLUE_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, LIGHT_BLUE_MASTIC_RESIN.get(), GarnishedBlocks.LIGHT_BLUE_ZULTANITE.get());
if (fluidState.is(LIGHT_BLUE_MASTIC_RESIN.get()))
return GarnishedBlocks.LIGHT_BLUE_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, CYAN_MASTIC_RESIN.get(), GarnishedBlocks.CYAN_ZULTANITE.get());
if (fluidState.is(CYAN_MASTIC_RESIN.get()))
return GarnishedBlocks.CYAN_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, PURPLE_MASTIC_RESIN.get(), GarnishedBlocks.PURPLE_ZULTANITE.get());
if (fluidState.is(PURPLE_MASTIC_RESIN.get()))
return GarnishedBlocks.PURPLE_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, MAGENTA_MASTIC_RESIN.get(), GarnishedBlocks.MAGENTA_ZULTANITE.get());
if (fluidState.is(MAGENTA_MASTIC_RESIN.get()))
return GarnishedBlocks.MAGENTA_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, PINK_MASTIC_RESIN.get(), GarnishedBlocks.PINK_ZULTANITE.get());
if (fluidState.is(PINK_MASTIC_RESIN.get()))
return GarnishedBlocks.PINK_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, BLACK_MASTIC_RESIN.get(), GarnishedBlocks.BLACK_ZULTANITE.get());
if (fluidState.is(BLACK_MASTIC_RESIN.get()))
return GarnishedBlocks.BLACK_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, GRAY_MASTIC_RESIN.get(), GarnishedBlocks.GRAY_ZULTANITE.get());
if (fluidState.is(GRAY_MASTIC_RESIN.get()))
return GarnishedBlocks.GRAY_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, LIGHT_GRAY_MASTIC_RESIN.get(), GarnishedBlocks.LIGHT_GRAY_ZULTANITE.get());
if (fluidState.is(LIGHT_GRAY_MASTIC_RESIN.get()))
return GarnishedBlocks.LIGHT_GRAY_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, WHITE_MASTIC_RESIN.get(), GarnishedBlocks.WHITE_ZULTANITE.get());
if (fluidState.is(WHITE_MASTIC_RESIN.get()))
return GarnishedBlocks.WHITE_ZULTANITE.getDefaultState();
// Fluids.lavaInteraction(fluidState, BROWN_MASTIC_RESIN.get(), GarnishedBlocks.BROWN_ZULTANITE.get());
if (fluidState.is(BROWN_MASTIC_RESIN.get()))
return GarnishedBlocks.BROWN_ZULTANITE.getDefaultState();

return null;
}
}
22 changes: 16 additions & 6 deletions src/main/resources/assets/garnished/lang/en_ca.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1090,12 +1090,22 @@
"item.garnished.peanut_oil_bucket": "Bucket of Peanut Oil",
"item.garnished.cashew_mixture_bucket": "Bucket of Cashew Mixture",
"item.garnished.mastic_resin_bucket": "Bucket of Mastic Resin",
"item.garnished.red_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.orange_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.yellow_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.green_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.blue_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.purple_mastic_resin_bucket": "Bucket of Coloured Mastic Resin",
"item.garnished.red_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.orange_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.yellow_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.green_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.lime_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.blue_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.light_blue_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.cyan_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.purple_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.magenta_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.pink_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.black_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.gray_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.light_gray_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.white_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.brown_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.dragon_breath_bucket": "Bucket of Dragon's Breath",
"item.garnished.sweet_tea_bucket": "Bucket of Sweet Tea",
"fluid.garnished.liquid_garnish": "Liquid Garnish",
Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/assets/garnished/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,8 +1158,18 @@
"item.garnished.orange_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.yellow_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.green_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.lime_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.blue_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.light_blue_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.cyan_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.purple_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.magenta_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.pink_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.black_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.gray_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.light_gray_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.white_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.brown_mastic_resin_bucket": "Bucket of Colored Mastic Resin",
"item.garnished.dragon_breath_bucket": "Bucket of Dragon's Breath",
"item.garnished.sweet_tea_bucket": "Bucket of Sweet Tea",
"fluid.garnished.liquid_garnish": "Liquid Garnish",
Expand Down

0 comments on commit b7cb997

Please sign in to comment.