first pass on 1.16.2 - no world gen

This commit is contained in:
modmuss50 2020-07-29 19:42:39 +01:00
parent ec1ae17134
commit 6e0fc6af61
49 changed files with 139 additions and 138 deletions

View file

@ -61,7 +61,7 @@ import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.damageSources.ElectrialShockSource;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;

View file

@ -47,7 +47,7 @@ import net.minecraft.world.World;
import reborncore.api.ToolManager;
import techreborn.init.ModSounds;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public class BlockFusionCoil extends Block {
@ -80,9 +80,9 @@ public class BlockFusionCoil extends Block {
@Environment(EnvType.CLIENT)
@Override
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip,
public void appendTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip,
TooltipContext flagIn) {
super.buildTooltip(stack, worldIn, tooltip, flagIn);
super.appendTooltip(stack, worldIn, tooltip, flagIn);
// TODO: Translate
tooltip.add(new LiteralText("Right click Fusion Control computer to auto place"));
}

View file

@ -48,7 +48,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import techreborn.blockentity.lighting.LampBlockEntity;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public class BlockLamp extends BaseBlockEntityProvider {

View file

@ -51,7 +51,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import techreborn.blockentity.machine.misc.AlarmBlockEntity;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public class BlockAlarm extends BaseBlockEntityProvider {
@ -161,7 +161,7 @@ public class BlockAlarm extends BaseBlockEntityProvider {
@Override
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
public void appendTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
tooltip.add(new TranslatableText("techreborn.tooltip.alarm").formatted(Formatting.GRAY));
}