WIP tag to interface, capacity spacing fix, removed Supercondensator

Sidenote: Also renamed DocumentAssistUtils to ToolTipAssistUtils.
This commit is contained in:
Justin Vitale 2020-01-04 14:20:34 +11:00
parent 7b99e2e9b7
commit 9aeddd204a
12 changed files with 24 additions and 178 deletions

View file

@ -53,7 +53,6 @@ import techreborn.init.TRBlockEntities;
import techreborn.init.TRContent;
import techreborn.items.ItemDynamicCell;
import techreborn.items.ItemFrequencyTransmitter;
import techreborn.utils.StackWIPHandler;
import javax.annotation.Nullable;
import java.util.Arrays;
@ -125,7 +124,6 @@ public class TechRebornClient implements ClientModInitializer {
});
StackToolTipHandler.setup();
StackWIPHandler.setup();
GuiBase.wrenchStack = new ItemStack(TRContent.WRENCH);
GuiBase.fluidCellProvider = ItemDynamicCell::getCellWithFluid;

View file

@ -157,7 +157,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
info.add(new TranslatableText("techreborn.tooltip.unit.empty"));
}
}
info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.unit.capacity") + ":" + Formatting.GOLD + this.tank.getCapacity() + " (" + this.tank.getCapacity().getRawValue() / 1000 + ")"));
info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.unit.capacity") + Formatting.GOLD + this.tank.getCapacity() + " (" + this.tank.getCapacity().getRawValue() / 1000 + ")"));
}
// IContainerProvider

View file

@ -338,7 +338,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity
}
}
info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.unit.capacity") + ": " + Formatting.GOLD + this.getMaxCapacity() +
info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.unit.capacity") + Formatting.GOLD + this.getMaxCapacity() +
" items (" + this.getMaxCapacity() / 64 + ")"));
}

View file

@ -24,25 +24,12 @@
package techreborn.blocks.generator;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.ItemStack;
import net.minecraft.world.BlockView;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;
import java.util.List;
import techreborn.utils.WIP;
public class BlockMagicEnergyAbsorber extends BlockMachineBase {
@Override
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED));
// TODO
// Remember to remove WIP override and imports once complete
}
public class BlockMagicEnergyAbsorber extends BlockMachineBase implements WIP {
//TODO remove WIP
@Override
public IMachineGuiHandler getGui() {

View file

@ -24,25 +24,12 @@
package techreborn.blocks.generator;
import net.minecraft.util.Formatting;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.text.LiteralText;
import net.minecraft.world.BlockView;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;
import java.util.List;
import techreborn.utils.WIP;
public class BlockMagicEnergyConverter extends BlockMachineBase {
@Override
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED));
// TODO
// Remember to remove WIP override and imports once complete
}
public class BlockMagicEnergyConverter extends BlockMachineBase implements WIP {
//TODO: remove WIP
@Override
public IMachineGuiHandler getGui() {

View file

@ -1,56 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2020 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.blocks.misc;
import net.minecraft.util.Formatting;
import net.minecraft.block.Material;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.text.LiteralText;
import net.minecraft.world.BlockView;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;
import java.util.List;
public class BlockSupercondensator extends BlockMachineBase {
public BlockSupercondensator(Material material) {
super();
}
@Override
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED));
// TODO
// Remember to remove WIP override and imports once complete
}
@Override
public IMachineGuiHandler getGui() {
return null;
}
}

View file

@ -27,7 +27,6 @@ package techreborn.events;
import net.fabricmc.fabric.api.event.client.ItemTooltipCallback;
import net.minecraft.block.Block;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
@ -41,7 +40,6 @@ import net.minecraft.util.Formatting;
import net.minecraft.util.registry.Registry;
import reborncore.api.IListInfoProvider;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.StringUtils;
import team.reborn.energy.Energy;
@ -50,7 +48,8 @@ import team.reborn.energy.EnergySide;
import techreborn.TechReborn;
import techreborn.init.TRContent;
import techreborn.items.ItemUpgrade;
import techreborn.utils.DocumentAssistUtils;
import techreborn.utils.ToolTipAssistUtils;
import techreborn.utils.WIP;
import java.util.List;
@ -68,15 +67,19 @@ public class StackToolTipHandler implements ItemTooltipCallback {
// Machine info and upgrades helper section
Block block = Block.getBlockFromItem(item);
if(block instanceof WIP){
components.add(new LiteralText(Formatting.RED + StringUtils.t("techreborn.tooltip.wip")));
}
if(block instanceof BaseBlockEntityProvider){
DocumentAssistUtils.addInfo(item.getTranslationKey(), components);
ToolTipAssistUtils.addInfo(item.getTranslationKey(), components);
}
if(item instanceof ItemUpgrade){
ItemUpgrade upgrade = (ItemUpgrade)item;
DocumentAssistUtils.addInfo(item.getTranslationKey(), components, false);
components.addAll(DocumentAssistUtils.getUpgradeStats(TRContent.Upgrades.valueOf(upgrade.name.toUpperCase()), stack.getCount(), Screen.hasShiftDown()));
ToolTipAssistUtils.addInfo(item.getTranslationKey(), components, false);
components.addAll(ToolTipAssistUtils.getUpgradeStats(TRContent.Upgrades.valueOf(upgrade.name.toUpperCase()), stack.getCount(), Screen.hasShiftDown()));
}

View file

@ -77,14 +77,11 @@ public class TRBlockEntities {
public static final BlockEntityType<StorageUnitBaseBlockEntity> STORAGE_UNIT = register(StorageUnitBaseBlockEntity.class, "storage_unit", TRContent.StorageUnit.values());
public static final BlockEntityType<TankUnitBaseBlockEntity> TANK_UNIT = register(TankUnitBaseBlockEntity.class, "tank_unit", TRContent.TankUnit.values());
public static final BlockEntityType<QuantumTankBlockEntity> QUANTUM_TANK = register(QuantumTankBlockEntity.class, "quantum_tank", TRContent.Machine.QUANTUM_TANK);
public static final BlockEntityType<QuantumChestBlockEntity> QUANTUM_CHEST = register(QuantumChestBlockEntity.class, "quantum_chest", TRContent.Machine.QUANTUM_CHEST);
public static final BlockEntityType<DigitalChestBlockEntity> DIGITAL_CHEST = register(DigitalChestBlockEntity.class, "digital_chest", TRContent.Machine.DIGITAL_CHEST);
public static final BlockEntityType<CreativeQuantumChestBlockEntity> CREATIVE_QUANTUM_CHEST = register(CreativeQuantumChestBlockEntity.class, "creative_quantum_chest", TRContent.Machine.CREATIVE_QUANTUM_CHEST);
public static final BlockEntityType<CreativeQuantumTankBlockEntity> CREATIVE_QUANTUM_TANK = register(CreativeQuantumTankBlockEntity.class, "creative_quantum_tank", TRContent.Machine.CREATIVE_QUANTUM_TANK);
public static final BlockEntityType<ThermalGeneratorBlockEntity> THERMAL_GEN = register(ThermalGeneratorBlockEntity.class, "thermal_generator", TRContent.Machine.THERMAL_GENERATOR);
public static final BlockEntityType<IndustrialCentrifugeBlockEntity> INDUSTRIAL_CENTRIFUGE = register(IndustrialCentrifugeBlockEntity.class, "industrial_centrifuge", TRContent.Machine.INDUSTRIAL_CENTRIFUGE);
public static final BlockEntityType<RollingMachineBlockEntity> ROLLING_MACHINE = register(RollingMachineBlockEntity.class, "rolling_machine", TRContent.Machine.ROLLING_MACHINE);

View file

@ -1,75 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2020 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.utils;
import net.fabricmc.fabric.api.event.client.ItemTooltipCallback;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.StringTag;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Formatting;
import reborncore.common.util.StringUtils;
import techreborn.init.TRContent;
import java.util.ArrayList;
/**
* Created by Mark on 23/03/2016.
*/
public class StackWIPHandler {
private static ArrayList<Block> wipBlocks = new ArrayList<>();
public static ArrayList<ItemStack> devHeads = new ArrayList<>();
public static void setup() {
wipBlocks.add(TRContent.Machine.MAGIC_ENERGY_ABSORBER.block);
wipBlocks.add(TRContent.Machine.MAGIC_ENERGY_CONVERTER.block);
addHead("modmuss50");
addHead("Gigabit101");
addHead("ProfProspector");
addHead("Rushmead");
ItemTooltipCallback.EVENT.register((stack, tooltipContext, components) -> {
Block block = Block.getBlockFromItem(stack.getItem());
if (block != null && wipBlocks.contains(block)) {
components.add(new LiteralText(Formatting.RED + StringUtils.t("techreborn.tooltip.wip")));
}
if (devHeads.contains(stack)) {
components.add(new LiteralText(Formatting.GOLD + "TechReborn Developer"));
}
});
}
private static void addHead(String name) {
ItemStack head = new ItemStack(Items.PLAYER_HEAD, 3);
head.setTag(new CompoundTag());
head.getTag().put("SkullOwner", StringTag.of(name));
devHeads.add(head);
}
}

View file

@ -36,7 +36,7 @@ import techreborn.init.TRContent;
import java.util.ArrayList;
import java.util.List;
public class DocumentAssistUtils {
public class ToolTipAssistUtils {
// Colour constants
private static final Formatting instructColour = Formatting.BLUE;

View file

@ -0,0 +1,5 @@
package techreborn.utils;
// Interface which when implemented by a Block will add a WIP tooltip
public interface WIP {
}

View file

@ -724,7 +724,7 @@
"techreborn.tooltip.generationRate.day": "Generation Rate Day",
"techreborn.tooltip.generationRate.night": "Generation Rate Night",
"techreborn.tooltip.greenhouse.upgrade_available": "Can be upgraded with powered lamps\nCheck multiblock hologram for details",
"techreborn.tooltip.unit.capacity": "Capacity",
"techreborn.tooltip.unit.capacity": "Capacity: ",
"techreborn.tooltip.unit.empty": "Empty",
"techreborn.tooltip.unit.divider": " of ",