Skip to content

Add config option for purple soda right click bottling #1643

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

Open
johnhoffm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add config option for purple soda right click bottling #1643

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
2 changes: 2 additions & 0 deletions src/main/java/com/github/alexmodguy/alexscaves/server/config/ACServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class ACServerConfig {
public final ForgeConfigSpec.DoubleValue abyssalTabletLootChance;
public final ForgeConfigSpec.DoubleValue forlornTabletLootChance;
public final ForgeConfigSpec.DoubleValue candyTabletLootChance;
public final ForgeConfigSpec.BooleanValue purpleSodaRightClickBottling;
public final ForgeConfigSpec.DoubleValue cabinMapLootChance;
public final ForgeConfigSpec.BooleanValue cartographersSellCabinMaps;
public final ForgeConfigSpec.BooleanValue wanderingTradersSellCabinMaps;
Expand Down Expand Up @@ -82,6 +83,7 @@ public ACServerConfig(final ForgeConfigSpec.Builder builder) {
totemOfPossessionPlayers = builder.comment("Whether the Totem of Possession can be applied to players.").translation("totem_of_possession_works_on_players").define("totem_of_possession_works_on_players", true);
darknessCloakChargeTime = builder.comment("The amount of time (in ticks) it takes to charge up the Cloak of Darkness ability.").translation("darkness_cloak_charge_time").defineInRange("darkness_cloak_charge_time", 1000, 20, Integer.MAX_VALUE);
darknessCloakFlightTime = builder.comment("The amount of time (in ticks) that players can fly with the Cloak of Darkness ability.").translation("darkness_cloak_fly_time").defineInRange("darkness_cloak_fly_time", 200, 20, Integer.MAX_VALUE);
purpleSodaRightClickBottling = builder.comment("Whether purple soda can be bottled with a right click of a glass bottle.").translation("purple_soda_right_click_bottling").define("purple_soda_right_click_bottling", true);
builder.pop();
builder.push("potion-behavior");
sugarRushSlowsTime = builder.comment("Whether the Sugar Rush changes the tick rate of the game in the area of affected players.").translation("sugar_rush_slows_time").define("sugar_rush_slows_time", true);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/alexmodguy/alexscaves/server/event/CommonEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ private static void checkAndDestroyExploitItem(Player player, EquipmentSlot slot
@SubscribeEvent
public void onRightClickItem(PlayerInteractEvent.RightClickItem event) {
Player player = event.getEntity();
if (event.getItemStack().getItem() == Items.GLASS_BOTTLE) {
if (event.getItemStack().getItem() == Items.GLASS_BOTTLE && AlexsCaves.COMMON_CONFIG.purpleSodaRightClickBottling.get()) {
HitResult raytraceresult = getPlayerPOVHitResult(event.getLevel(), player, ClipContext.Fluid.SOURCE_ONLY);
if (raytraceresult.getType() == HitResult.Type.BLOCK) {
BlockPos blockpos = ((BlockHitResult) raytraceresult).getBlockPos();
Expand Down