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

Fix shutter cover exposing item and fluid handlers #2572

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Fix shutter cover exposing item and fluid handlers #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96b2bb5
shutter cover blocks getting handler capabilities
omergunr100 Dec 17, 2024
026cd21
cover toggle support for hiding capabilities
omergunr100 Dec 17, 2024
7d76cd5
added lang entries for shutter cover
omergunr100 Dec 17, 2024
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/generated/resources/assets/gtceu/lang/en_ud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,6 +2020,8 @@
"cover.robotic_arm.transfer_mode.keep_exact": "ʇɔɐxƎ dǝǝʞ",
"cover.robotic_arm.transfer_mode.transfer_any": "ʎuⱯ ɹǝɟsuɐɹ⟘",
"cover.robotic_arm.transfer_mode.transfer_exact": "ʇɔɐxƎ ʎןddnS",
"cover.shutter.message.disabled": "ɹǝʇʇnɥs pǝuǝdO",
"cover.shutter.message.enabled": "ɹǝʇʇnɥs pǝsoןƆ",
"cover.storage.title": "ɹǝʌoƆ ǝbɐɹoʇS",
"cover.tag_filter.info.0": "suoıssǝɹdxǝ xǝןdɯoɔ sʇdǝɔɔⱯq§",
"cover.tag_filter.info.1": "ᗡNⱯ = &",
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,6 +2020,8 @@
"cover.robotic_arm.transfer_mode.keep_exact": "Keep Exact",
"cover.robotic_arm.transfer_mode.transfer_any": "Transfer Any",
"cover.robotic_arm.transfer_mode.transfer_exact": "Supply Exact",
"cover.shutter.message.disabled": "Opened shutter",
"cover.shutter.message.enabled": "Closed shutter",
"cover.storage.title": "Storage Cover",
"cover.tag_filter.info.0": "§bAccepts complex expressions",
"cover.tag_filter.info.1": "& = AND",
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/cover/ShutterCover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.gregtechceu.gtceu.api.capability.ICoverable;
import com.gregtechceu.gtceu.api.cover.CoverBehavior;
import com.gregtechceu.gtceu.api.cover.CoverDefinition;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;

import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder;
Expand All @@ -15,10 +16,12 @@
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.items.IItemHandlerModifiable;

import lombok.Getter;
import lombok.Setter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.annotation.ParametersAreNonnullByDefault;

Expand Down Expand Up @@ -59,6 +62,16 @@ public InteractionResult onSoftMalletClick(Player playerIn, InteractionHand hand
return InteractionResult.SUCCESS;
}

@Override
public @Nullable IItemHandlerModifiable getItemHandlerCap(IItemHandlerModifiable defaultValue) {
return isWorkingEnabled() ? null : super.getItemHandlerCap(defaultValue);
}

@Override
public @Nullable IFluidHandlerModifiable getFluidHandlerCap(IFluidHandlerModifiable defaultValue) {
return isWorkingEnabled() ? null : super.getFluidHandlerCap(defaultValue);
}

@Override
public ManagedFieldHolder getFieldHolder() {
return MANAGED_FIELD_HOLDER;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ public static void init(RegistrateLangProvider provider) {
"Output: Normal\n\n" + advancedItemDetectorInvertDescription);
provider.add("cover.advanced_item_detector.max", "Max Items");
provider.add("cover.advanced_item_detector.min", "Min Items");
provider.add("cover.shutter.message.enabled", "Closed shutter");
provider.add("cover.shutter.message.disabled", "Opened shutter");

replace(provider, "item.gtceu.bucket", "%s Bucket");
replace(provider, GTMaterials.FullersEarth.getUnlocalizedName(), "Fuller's Earth");
Expand Down
Loading