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 part sharing tooltip missing on some parts #2375

Merged
merged 1 commit into from
Feb 5, 2024
Merged

Fix part sharing tooltip missing on some parts #2375

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
10 changes: 10 additions & 0 deletions ...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityComputationHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
import gregtech.client.renderer.texture.Textures;
import gregtech.common.pipelike.optical.tile.TileEntityOpticalPipe;

import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;

import codechicken.lib.render.CCRenderState;
Expand Down Expand Up @@ -166,4 +169,11 @@ public <T> T getCapability(Capability<T> capability, EnumFacing side) {
}
return super.getCapability(capability, side);
}

@Override
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced) {
super.addInformation(stack, world, tooltip, advanced);
tooltip.add(I18n.format("gregtech.universal.disabled"));
}
}
7 changes: 6 additions & 1 deletion .../gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityDataAccessHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List
} else {
tooltip.add(I18n.format("gregtech.machine.data_access_hatch.tooltip.2", getInventorySize()));
}
if (canPartShare()) {
tooltip.add(I18n.format("gregtech.universal.enabled"));
} else {
tooltip.add(I18n.format("gregtech.universal.disabled"));
}
}

@NotNull
Expand All @@ -199,7 +204,7 @@ public List<ITextComponent> getDataInfo() {

@Override
public boolean canPartShare() {
return false;
return isCreative;
}

@Override
Expand Down
15 changes: 15 additions & 0 deletions ...ava/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,22 @@
import gregtech.client.renderer.texture.Textures;
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;

import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;

import codechicken.lib.render.CCRenderState;
import codechicken.lib.render.pipeline.IVertexOperation;
import codechicken.lib.vec.Matrix4;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;

Expand Down Expand Up @@ -207,6 +210,18 @@ public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
heldItems.removeNotifiableMetaTileEntity(controllerBase);
}

@Override
public boolean canPartShare() {
return false;
}

@Override
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced) {
super.addInformation(stack, world, tooltip, advanced);
tooltip.add(I18n.format("gregtech.universal.disabled"));
}

private class ObjectHolderHandler extends NotifiableItemStackHandler {

public ObjectHolderHandler(MetaTileEntity metaTileEntity) {
Expand Down
11 changes: 11 additions & 0 deletions ...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityOpticalDataHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@
import gregtech.client.renderer.texture.Textures;
import gregtech.common.pipelike.optical.tile.TileEntityOpticalPipe;

import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;

import codechicken.lib.render.CCRenderState;
import codechicken.lib.render.pipeline.IVertexOperation;
import codechicken.lib.vec.Matrix4;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.List;
Expand Down Expand Up @@ -134,4 +138,11 @@ public MultiblockAbility<IOpticalDataAccessHatch> getAbility() {
public void registerAbilities(@NotNull List<IOpticalDataAccessHatch> abilityList) {
abilityList.add(this);
}

@Override
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced) {
super.addInformation(stack, world, tooltip, advanced);
tooltip.add(I18n.format("gregtech.universal.disabled"));
}
}
Loading