From 723c311809a941dce8f2b3c7011bbfc958413298 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 24 Jan 2020 22:53:01 +0100 Subject: [PATCH] Port to Minecraft 1.15.2 --- CHANGELOG.md | 3 + build.gradle | 12 +-- .../apiimpl/autocrafting/AllowedTagList.java | 2 +- .../autocrafting/CraftingPatternFactory.java | 4 +- .../apiimpl/network/grid/GridTab.java | 4 +- .../block/ConstructorBlock.java | 2 +- .../refinedstorage/block/ControllerBlock.java | 2 +- .../refinedstorage/block/CrafterBlock.java | 2 +- .../block/CrafterManagerBlock.java | 2 +- .../block/CraftingMonitorBlock.java | 2 +- .../refinedstorage/block/DestructorBlock.java | 2 +- .../refinedstorage/block/DetectorBlock.java | 2 +- .../refinedstorage/block/DiskDriveBlock.java | 2 +- .../block/DiskManipulatorBlock.java | 2 +- .../refinedstorage/block/ExporterBlock.java | 2 +- .../block/ExternalStorageBlock.java | 2 +- .../block/FluidInterfaceBlock.java | 2 +- .../block/FluidStorageBlock.java | 2 +- .../refinedstorage/block/GridBlock.java | 2 +- .../refinedstorage/block/ImporterBlock.java | 2 +- .../refinedstorage/block/InterfaceBlock.java | 2 +- .../block/NetworkTransmitterBlock.java | 2 +- .../block/PortableGridBlock.java | 2 +- .../refinedstorage/block/RelayBlock.java | 2 +- .../block/SecurityManagerBlock.java | 2 +- .../refinedstorage/block/StorageBlock.java | 2 +- .../block/StorageMonitorBlock.java | 2 +- .../block/WirelessTransmitterBlock.java | 2 +- .../refinedstorage/item/PatternItem.java | 2 +- .../refinedstorage/render/FluidRenderer.java | 16 ++-- .../render/model/DelegateBakedModel.java | 6 +- .../model/DiskManipulatorBakedModel.java | 2 +- .../render/model/FullbrightBakedModel.java | 4 +- .../model/PortableGridItemBakedModel.java | 5 ++ .../render/model/TRSRBakedModel.java | 9 ++- .../tesr/PatternItemStackTileRenderer.java | 4 +- .../tesr/StorageMonitorTileRenderer.java | 41 +++++----- .../refinedstorage/screen/BaseScreen.java | 13 ++-- .../screen/CrafterManagerScreen.java | 7 +- .../refinedstorage/screen/DetectorScreen.java | 4 +- .../refinedstorage/screen/FilterScreen.java | 8 +- .../screen/SecurityManagerScreen.java | 8 +- .../screen/grid/AlternativesScreen.java | 9 +-- .../screen/grid/GridScreen.java | 22 +++--- .../screen/grid/stack/FluidGridStack.java | 2 +- .../screen/widget/CheckBoxWidget.java | 58 --------------- .../screen/widget/CheckboxWidget.java | 74 +++++++++++++++++++ .../refinedstorage/setup/ClientSetup.java | 46 ++++++------ .../refinedstorage/tile/DiskDriveTile.java | 2 +- .../tile/DiskManipulatorTile.java | 2 +- .../refinedstorage/util/RenderUtils.java | 60 ++++++--------- .../resources/META-INF/accesstransformer.cfg | 1 + src/main/resources/META-INF/mods.toml | 2 +- 53 files changed, 245 insertions(+), 233 deletions(-) delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckBoxWidget.java create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 6792a0c98..3b017c6e3 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.8.1 +- Port to Minecraft 1.15.2 (raoulvdberge) + ### 1.8 - Port to Minecraft 1.15 (raoulvdberge) diff --git a/build.gradle b/build.gradle index 32b892387..7ccb5fccb 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ archivesBaseName = 'refinedstorage' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190719-1.14.3' + mappings channel: 'snapshot', version: '20200124-1.15.1' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { @@ -94,14 +94,14 @@ processResources { } dependencies { - minecraft 'net.minecraftforge:forge:1.15.1-30.0.41' + minecraft 'net.minecraftforge:forge:1.15.2-31.0.0' - compileOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1") + compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") - compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.15.1' + //compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.15.1' - runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.15.1:11.0.0') + //runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.15.1:11.0.0') } jar { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java index e81fe3a42..d1e0178a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java @@ -56,7 +56,7 @@ public class AllowedTagList { for (Set tags : tagsPerSlot) { ListNBT subList = new ListNBT(); - tags.forEach(t -> subList.add(StringNBT.func_229705_a_(t.toString()))); + tags.forEach(t -> subList.add(StringNBT.valueOf(t.toString()))); list.add(subList); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 4488bc0ba..0bbaf95a2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -133,7 +133,7 @@ public class CraftingPatternFactory { possibilities.add(input.copy()); if (allowedTagList != null) { - Collection tagsOfFluid = FluidTags.func_226157_a_().getOwningTags(input.getFluid()); + Collection tagsOfFluid = FluidTags.getCollection().getOwningTags(input.getFluid()); Set declaredAllowedTags = allowedTagList.getAllowedFluidTags().get(i); for (ResourceLocation declaredAllowedTag : declaredAllowedTags) { @@ -146,7 +146,7 @@ public class CraftingPatternFactory { ) ); } else { - for (Fluid element : FluidTags.func_226157_a_().get(declaredAllowedTag).getAllElements()) { + for (Fluid element : FluidTags.getCollection().get(declaredAllowedTag).getAllElements()) { possibilities.add(new FluidStack(element, input.getAmount())); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java index 02535919f..b0b5d2b3c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java @@ -1,15 +1,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.grid; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; import com.raoulvdberge.refinedstorage.api.util.IFilter; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.client.gui.GuiUtils; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java index 84ddf16cd..0a92dbae9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java @@ -87,7 +87,7 @@ public class ConstructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java index 84c7566f5..058744511 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java @@ -107,7 +107,7 @@ public class ControllerBlock extends BaseBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java index 4b57770fb..1d65770ba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java @@ -57,7 +57,7 @@ public class CrafterBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java index e948cd559..0bb98b1cd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java @@ -40,7 +40,7 @@ public class CrafterManagerBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java index c8a648f62..a07140f36 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java @@ -41,7 +41,7 @@ public class CraftingMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { CraftingMonitorTile tile = (CraftingMonitorTile) world.getTileEntity(pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java index 18be50a7a..eb658ffe5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java @@ -85,7 +85,7 @@ public class DestructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java index db86fe115..14038940f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java @@ -68,7 +68,7 @@ public class DetectorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java index 6caf5aea1..ef84d336f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java @@ -41,7 +41,7 @@ public class DiskDriveBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, rayTraceResult.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java index 8c0420859..7609adc21 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java @@ -36,7 +36,7 @@ public class DiskManipulatorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, rayTraceResult.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java index 996b10d11..b5fc7697a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java @@ -108,7 +108,7 @@ public class ExporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java index b0ab0e1e1..f7bfaf922 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java @@ -88,7 +88,7 @@ public class ExternalStorageBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java index 7e319028b..212e611f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java @@ -37,7 +37,7 @@ public class FluidInterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java index c078b7b8e..08aa7a813 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java @@ -63,7 +63,7 @@ public class FluidStorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( ((FluidStorageTile) world.getTileEntity(pos)).getNode().getTitle(), diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java index 101cac477..d587eb7b3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java @@ -49,7 +49,7 @@ public class GridBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java index 65b47bad0..d5198864c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java @@ -108,7 +108,7 @@ public class ImporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java index 186e818e6..75bec1f2a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java @@ -37,7 +37,7 @@ public class InterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java index 9776fef0f..fbef8b1f8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java @@ -36,7 +36,7 @@ public class NetworkTransmitterBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java index b25f4a790..04f2d6a8d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java @@ -76,7 +76,7 @@ public class PortableGridBlock extends BaseBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote) { API.instance().getGridManager().openGrid(PortableGridBlockGridFactory.ID, (ServerPlayerEntity) player, pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java index fa6ab462b..f5b632bf1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java @@ -36,7 +36,7 @@ public class RelayBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java index f11aea022..f2b8f794d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java @@ -36,7 +36,7 @@ public class SecurityManagerBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { Runnable action = () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java index c32bce52e..31646cde5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java @@ -63,7 +63,7 @@ public class StorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( ((StorageTile) world.getTileEntity(pos)).getNode().getTitle(), diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java index 497c5fd22..837949d9c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java @@ -45,7 +45,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { ItemStack held = player.inventory.getCurrentItem(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java index 3725101f7..a80b58341 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java @@ -68,7 +68,7 @@ public class WirelessTransmitterBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java index 2e9d5ff50..64c128aca 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java @@ -49,7 +49,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { private static final int VERSION = 1; public PatternItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).setTEISR(() -> PatternItemStackTileRenderer::new)); + super(new Item.Properties().group(RS.MAIN_GROUP).setISTER(() -> PatternItemStackTileRenderer::new)); this.setRegistryName(RS.ID, "pattern"); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java index c8a7f2005..8c89273e4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java @@ -1,18 +1,14 @@ package com.raoulvdberge.refinedstorage.render; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.fluid.Fluid; import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; @@ -77,7 +73,7 @@ public class FluidRenderer { private void drawTiledSprite(final int xPosition, final int yPosition, final int tiledWidth, final int tiledHeight, int color, int scaledAmount, TextureAtlasSprite sprite) { Minecraft minecraft = Minecraft.getInstance(); - minecraft.getTextureManager().bindTexture(PlayerContainer.field_226615_c_); + minecraft.getTextureManager().bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); setGLColorFromInt(color); final int xTileCount = tiledWidth / TEX_WIDTH; @@ -107,7 +103,7 @@ public class FluidRenderer { Fluid fluid = fluidStack.getFluid(); FluidAttributes attributes = fluid.getAttributes(); ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); - return Minecraft.getInstance().func_228015_a_(PlayerContainer.field_226615_c_).apply(fluidStill); + return Minecraft.getInstance().getTextureGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); } private static void setGLColorFromInt(int color) { @@ -130,10 +126,10 @@ public class FluidRenderer { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX); - bufferBuilder.func_225582_a_(xCoord, yCoord + 16, zLevel).func_225583_a_((float) uMin, (float) vMax).endVertex(); - bufferBuilder.func_225582_a_(xCoord + 16 - maskRight, yCoord + 16, zLevel).func_225583_a_((float) uMax, (float) vMax).endVertex(); - bufferBuilder.func_225582_a_(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).func_225583_a_((float) uMax, (float) vMin).endVertex(); - bufferBuilder.func_225582_a_(xCoord, yCoord + maskTop, zLevel).func_225583_a_((float) uMin, (float) vMin).endVertex(); + bufferBuilder.pos(xCoord, yCoord + 16, zLevel).tex((float) uMin, (float) vMax).endVertex(); + bufferBuilder.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex((float) uMax, (float) vMax).endVertex(); + bufferBuilder.pos(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex((float) uMax, (float) vMin).endVertex(); + bufferBuilder.pos(xCoord, yCoord + maskTop, zLevel).tex((float) uMin, (float) vMin).endVertex(); tessellator.draw(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java index 286e0d26e..bf4e45d87 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java @@ -8,7 +8,6 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; import java.util.List; @@ -37,6 +36,11 @@ public class DelegateBakedModel implements IBakedModel { return base.isGui3d(); } + @Override + public boolean func_230044_c_() { + return base.func_230044_c_(); + } + @Override public boolean isBuiltInRenderer() { return base.isBuiltInRenderer(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java index 87cd6c94c..acaa2c892 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java @@ -131,7 +131,7 @@ public class DiskManipulatorBakedModel extends DelegateBakedModel { trans.add(0, -((6F / 16F) + (3F * y) / 16F), 0); // Remove from Y - model.transformation = new TransformationMatrix(trans, model.transformation.func_227989_d_(), model.transformation.getScale(), model.transformation.getRightRot()); + model.transformation = new TransformationMatrix(trans, model.transformation.getRotationLeft(), model.transformation.getScale(), model.transformation.getRightRot()); disks.get(facing).get(type).add(model); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java index b4f855456..4951dc39f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java @@ -51,7 +51,7 @@ public class FullbrightBakedModel extends DelegateBakedModel { for (int i = 0; i < quads.size(); ++i) { BakedQuad quad = quads.get(i); - if (textures.contains(quad.getSprite().getName())) { + if (textures.contains(quad.func_187508_a().getName())) { quads.set(i, transformQuad(quad)); } } @@ -72,7 +72,7 @@ public class FullbrightBakedModel extends DelegateBakedModel { vertexData, quad.getTintIndex(), quad.getFace(), - quad.getSprite(), + quad.func_187508_a(), quad.shouldApplyDiffuseLighting() ); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java index af28f26dd..77fa838bf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java @@ -58,6 +58,11 @@ public class PortableGridItemBakedModel implements IBakedModel { return base.isGui3d(); } + @Override + public boolean func_230044_c_() { + return base.func_230044_c_(); + } + @Override public boolean isBuiltInRenderer() { return base.isBuiltInRenderer(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java index e3cd52915..3f4076c7f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java @@ -10,9 +10,7 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; -import net.minecraftforge.client.model.ModelDataManager; import net.minecraftforge.client.model.data.EmptyModelData; -import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; import net.minecraftforge.client.model.pipeline.TRSRTransformer; import net.minecraftforge.common.model.TransformationHelper; @@ -69,7 +67,7 @@ public class TRSRBakedModel implements IBakedModel { } for (BakedQuad quad : original.getQuads(state, side, rand, EmptyModelData.INSTANCE)) { - BakedQuadBuilder builder = new BakedQuadBuilder(quad.getSprite()); + BakedQuadBuilder builder = new BakedQuadBuilder(quad.func_187508_a()); TRSRTransformer transformer = new TRSRTransformer(builder, transformation.blockCenterToCorner()); quad.pipe(transformer); @@ -90,6 +88,11 @@ public class TRSRBakedModel implements IBakedModel { return original.isGui3d(); } + @Override + public boolean func_230044_c_() { + return original.func_230044_c_(); + } + @Override public boolean isBuiltInRenderer() { return original.isBuiltInRenderer(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java index 46fbd89f2..50fd6b25c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java @@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack; public class PatternItemStackTileRenderer extends ItemStackTileEntityRenderer { @Override - public void func_228364_a_(ItemStack stack, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int p_228364_4_, int p_228364_5_) { + public void render(ItemStack stack, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int p_228364_4_, int p_228364_5_) { CraftingPattern pattern = PatternItem.fromCache(null, stack); ItemStack outputStack = pattern.getOutputs().get(0); - outputStack.getItem().getTileEntityItemStackRenderer().func_228364_a_(outputStack, matrixStack, renderTypeBuffer, p_228364_4_, p_228364_5_); + outputStack.getItem().getItemStackTileEntityRenderer().render(outputStack, matrixStack, renderTypeBuffer, p_228364_4_, p_228364_5_); } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index 75c6be31c..b8d7a87a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; -import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.model.TransformationHelper; public class StorageMonitorTileRenderer extends TileEntityRenderer { @@ -23,7 +22,7 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer extends ContainerScreen } } - public CheckBoxWidget addCheckBox(int x, int y, String text, boolean checked, Button.IPressable onPress) { - CheckBoxWidget checkBox = new CheckBoxWidget(x, y, text, checked, onPress); + public CheckboxWidget addCheckBox(int x, int y, String text, boolean checked, Consumer onPress) { + CheckboxWidget checkBox = new CheckboxWidget(x, y, text, checked, onPress); this.addButton(checkBox); @@ -344,7 +343,7 @@ public abstract class BaseScreen extends ContainerScreen } public static boolean isKeyDown(KeyBinding keybinding) { - return InputMappings.isKeyDown(Minecraft.getInstance().func_228018_at_().getHandle(), keybinding.getKey().getKeyCode()) && + return InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), keybinding.getKey().getKeyCode()) && keybinding.getKeyConflictContext().isActive() && keybinding.getKeyModifier().isActive(keybinding.getKeyConflictContext()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java index 03a49a447..51a040d8c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java @@ -18,11 +18,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.util.text.ITextComponent; -import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak; import java.util.Map; -@MouseTweaksDisableWheelTweak +// TODO @MouseTweaksDisableWheelTweak public class CrafterManagerScreen extends BaseScreen implements IScreenInfoProvider { private CrafterManagerNetworkNode crafterManager; @@ -56,7 +55,7 @@ public class CrafterManagerScreen extends BaseScreen im if (searchField == null) { searchField = new SearchWidget(font, sx, sy, 88 - 6); - searchField.func_212954_a(value -> { + searchField.setResponder(value -> { searchField.updateJei(); container.initSlots(null); @@ -152,7 +151,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override public boolean keyPressed(int key, int scanCode, int modifiers) { - if (searchField.keyPressed(key, scanCode, modifiers) || searchField.func_212955_f()) { + if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canWrite()) { return true; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java index 81de43c19..930438566 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java @@ -36,7 +36,7 @@ public class DetectorScreen extends BaseScreen { amountField.setCanLoseFocus(true); amountField.setFocused2(false); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); - amountField.func_212954_a(value -> { + amountField.setResponder(value -> { try { int result = Integer.parseInt(value); @@ -74,7 +74,7 @@ public class DetectorScreen extends BaseScreen { return true; } - if (amountField.keyPressed(key, scanCode, modifiers) || amountField.func_212955_f()) { + if (amountField.keyPressed(key, scanCode, modifiers) || amountField.canWrite()) { return true; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java index 1568f95c4..5e8964fde 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java @@ -7,6 +7,7 @@ import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.item.FilterItem; import com.raoulvdberge.refinedstorage.network.FilterUpdateMessage; import com.raoulvdberge.refinedstorage.render.RenderSettings; +import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.FilterTypeSideButton; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.button.Button; @@ -14,7 +15,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.config.GuiCheckBox; import org.lwjgl.glfw.GLFW; public class FilterScreen extends BaseScreen { @@ -26,7 +26,7 @@ public class FilterScreen extends BaseScreen { private String name; private int type; - private GuiCheckBox modFilterCheckBox; + private CheckboxWidget modFilterCheckBox; private Button modeButton; private TextFieldWidget nameField; @@ -73,7 +73,7 @@ public class FilterScreen extends BaseScreen { nameField.setCanLoseFocus(true); nameField.setFocused2(false); nameField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); - nameField.func_212954_a(name -> sendUpdate()); + nameField.setResponder(name -> sendUpdate()); addButton(nameField); @@ -96,7 +96,7 @@ public class FilterScreen extends BaseScreen { return true; } - if (nameField.keyPressed(key, scanCode, modifiers) || nameField.func_212955_f()) { + if (nameField.keyPressed(key, scanCode, modifiers) || nameField.canWrite()) { return true; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java index 5f2fecfbd..c3704763b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.container.SecurityManagerContainer; import com.raoulvdberge.refinedstorage.item.SecurityCardItem; import com.raoulvdberge.refinedstorage.network.SecurityManagerUpdateMessage; +import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.SecurityManagerTile; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -12,11 +13,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.config.GuiCheckBox; public class SecurityManagerScreen extends BaseScreen { private final SecurityManagerTile securityManager; - private GuiCheckBox[] permissions = new GuiCheckBox[Permission.values().length]; + private CheckboxWidget[] permissions = new CheckboxWidget[Permission.values().length]; public SecurityManagerScreen(SecurityManagerContainer container, PlayerInventory inventory, ITextComponent title) { super(container, 176, 234, inventory, title); @@ -47,7 +47,7 @@ public class SecurityManagerScreen extends BaseScreen ItemStack card = securityManager.getNode().getEditCard().getStackInSlot(0); for (Permission permission : Permission.values()) { - permissions[permission.getId()].setIsChecked(!card.isEmpty() && SecurityCardItem.hasPermission(card, permission)); + permissions[permission.getId()].setChecked(!card.isEmpty() && SecurityCardItem.hasPermission(card, permission)); } } @@ -65,7 +65,7 @@ public class SecurityManagerScreen extends BaseScreen renderString(7, 140, I18n.format("container.inventory")); for (int i = 0; i < permissions.length; ++i) { - GuiCheckBox permission = permissions[i]; + CheckboxWidget permission = permissions[i]; if (RenderUtils.inBounds(permission.x - guiLeft, permission.y - guiTop, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { renderTooltip(mouseX, mouseY, I18n.format("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java index fc1c073e8..ffcdcb2b2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.AlternativesContainer; import com.raoulvdberge.refinedstorage.render.FluidRenderer; import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.widget.CheckBoxWidget; +import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; @@ -13,7 +13,6 @@ import com.raoulvdberge.refinedstorage.tile.grid.GridTile; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; @@ -98,14 +97,14 @@ public class AlternativesScreen extends BaseScreen { } else if (fluid != null) { lines.add(new FluidLine(fluid)); - for (ResourceLocation owningTag : FluidTags.func_226157_a_().getOwningTags(fluid.getFluid())) { + for (ResourceLocation owningTag : FluidTags.getCollection().getOwningTags(fluid.getFluid())) { lines.add(new TagLine(owningTag, GridTile.ALLOWED_FLUID_TAGS.getValue().get(slot).contains(owningTag))); int fluidCount = 0; FluidListLine line = new FluidListLine(); - for (Fluid fluid : FluidTags.func_226157_a_().get(owningTag).getAllElements()) { + for (Fluid fluid : FluidTags.getCollection().get(owningTag).getAllElements()) { if (fluidCount > 0 && fluidCount % 8 == 0) { lines.add(line); line = new FluidListLine(); @@ -304,7 +303,7 @@ public class AlternativesScreen extends BaseScreen { private class TagLine implements Line { private final ResourceLocation tagName; - private final CheckBoxWidget widget; + private final CheckboxWidget widget; public TagLine(ResourceLocation tagName, boolean checked) { this.tagName = tagName; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java index 36409a385..1c76c90ee 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.screen.grid; import com.google.common.collect.Lists; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSKeyBindings; @@ -20,6 +19,7 @@ import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; import com.raoulvdberge.refinedstorage.screen.grid.view.FluidGridView; import com.raoulvdberge.refinedstorage.screen.grid.view.IGridView; import com.raoulvdberge.refinedstorage.screen.grid.view.ItemGridView; +import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget; import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget; @@ -31,13 +31,11 @@ import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; import com.raoulvdberge.refinedstorage.util.RenderUtils; import com.raoulvdberge.refinedstorage.util.TimeUtils; import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.config.GuiCheckBox; import org.lwjgl.glfw.GLFW; import java.util.LinkedList; @@ -47,8 +45,8 @@ public class GridScreen extends BaseScreen implements IScreenInfo private IGridView view; private SearchWidget searchField; - private GuiCheckBox exactPattern; - private GuiCheckBox processingPattern; + private CheckboxWidget exactPattern; + private CheckboxWidget processingPattern; private ScrollbarWidget scrollbar; @@ -104,7 +102,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo if (searchField == null) { searchField = new SearchWidget(font, sx, sy, 88 - 6); - searchField.func_212954_a(value -> { + searchField.setResponder(value -> { searchField.updateJei(); getView().sort(); // Use getter since this view can be replaced. @@ -137,7 +135,13 @@ public class GridScreen extends BaseScreen implements IScreenInfo }); if (!processingPattern.isChecked()) { - exactPattern = addCheckBox(processingPattern.x + processingPattern.getWidth() + 5, y + getTopHeight() + (getVisibleRows() * 18) + 60, I18n.format("misc.refinedstorage.exact"), GridTile.EXACT_PATTERN.getValue(), btn -> TileDataManager.setParameter(GridTile.EXACT_PATTERN, exactPattern.isChecked())); + exactPattern = addCheckBox( + processingPattern.x + processingPattern.getWidth() + 5, + y + getTopHeight() + (getVisibleRows() * 18) + 60, + I18n.format("misc.refinedstorage.exact"), + GridTile.EXACT_PATTERN.getValue(), + btn -> TileDataManager.setParameter(GridTile.EXACT_PATTERN, exactPattern.isChecked()) + ); } addSideButton(new TypeSideButton(this, GridTile.PROCESSING_TYPE)); @@ -538,7 +542,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo @Override public boolean keyPressed(int key, int scanCode, int modifiers) { - if (searchField.keyPressed(key, scanCode, modifiers) || searchField.func_212955_f()) { + if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canWrite()) { return true; } @@ -551,7 +555,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo public void updateExactPattern(boolean checked) { if (exactPattern != null) { - exactPattern.setIsChecked(checked); + exactPattern.setChecked(checked); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java index ae7d7e5a5..6c2192bc0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -120,7 +120,7 @@ public class FluidGridStack implements IGridStack { if (cachedTags == null) { cachedTags = new HashSet<>(); - for (ResourceLocation owningTag : FluidTags.func_226157_a_().getOwningTags(stack.getFluid())) { + for (ResourceLocation owningTag : FluidTags.getCollection().getOwningTags(stack.getFluid())) { cachedTags.add(owningTag.getPath()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckBoxWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckBoxWidget.java deleted file mode 100644 index 093d7ff5f..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckBoxWidget.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.raoulvdberge.refinedstorage.screen.widget; - -import net.minecraft.client.Minecraft; -import net.minecraftforge.fml.client.config.GuiCheckBox; -import net.minecraftforge.fml.client.config.GuiUtils; - -// @Volatile: Copied from Forge 1.12. Remove this if GuiCheckBox gets ported over correctly. -public class CheckBoxWidget extends GuiCheckBox { - private static final int BOX_WIDTH = 13; - - private IPressable onPress; - private String displayString; - private boolean shadow = true; - - public CheckBoxWidget(int xPos, int yPos, String displayString, boolean isChecked, IPressable onPress) { - super(xPos, yPos, displayString, isChecked); - - this.onPress = onPress; - this.displayString = displayString; - this.width = Minecraft.getInstance().fontRenderer.getStringWidth(displayString) + BOX_WIDTH + 3; - } - - public void setShadow(boolean shadow) { - this.shadow = shadow; - } - - @Override - public void renderButton(int mouseX, int mouseY, float partial) { - if (visible) { - GuiUtils.drawContinuousTexturedBox(WIDGETS_LOCATION, x, y, 0, 46, BOX_WIDTH, height, 200, 20, 2, 3, 2, 2, 0); - - int color = 14737632; - - if (!active) { - color = 10526880; - } else if (packedFGColor != 0) { - color = packedFGColor; - } - - if (isChecked()) { - drawCenteredString(Minecraft.getInstance().fontRenderer, "x", x + BOX_WIDTH / 2 + 1, y + 1, 14737632); - } - - if (!shadow) { - Minecraft.getInstance().fontRenderer.drawString(displayString, x + BOX_WIDTH + 2, y + 2, color); - } else { - Minecraft.getInstance().fontRenderer.drawStringWithShadow(displayString, x + BOX_WIDTH + 2, y + 2, color); - } - } - } - - @Override - public void onPress() { - super.onPress(); - - onPress.onPress(this); - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java new file mode 100644 index 000000000..cb6831ded --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java @@ -0,0 +1,74 @@ +package com.raoulvdberge.refinedstorage.screen.widget; + +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.widget.button.CheckboxButton; +import net.minecraft.util.ResourceLocation; + +import java.util.function.Consumer; + +public class CheckboxWidget extends CheckboxButton { + private static final ResourceLocation TEXTURE = new ResourceLocation("textures/gui/checkbox.png"); + private static final int BOX_WIDTH = 13; + + private final Consumer onPress; + private boolean shadow = true; + + public CheckboxWidget(int x, int y, String text, boolean isChecked, Consumer onPress) { + super( + x, + y, + Minecraft.getInstance().fontRenderer.getStringWidth(text) + BOX_WIDTH, + 10, + text, + isChecked + ); + + this.onPress = onPress; + } + + public void setShadow(boolean shadow) { + this.shadow = shadow; + } + + @Override + public void onPress() { + super.onPress(); + + this.onPress.accept(this); + } + + public void setChecked(boolean value) { + this.checked = value; + } + + @Override + public void renderButton(int p_renderButton_1_, int p_renderButton_2_, float p_renderButton_3_) { + Minecraft mc = Minecraft.getInstance(); + mc.getTextureManager().bindTexture(TEXTURE); + RenderSystem.enableDepthTest(); + FontRenderer fontRenderer = mc.fontRenderer; + RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + blit(this.x, this.y, 0.0F, this.checked ? 10.0F : 0.0F, 10, this.height, 16, 32); + this.renderBg(mc, p_renderButton_1_, p_renderButton_2_); + + int color = 14737632; + + if (!active) { + color = 10526880; + } else if (packedFGColor != 0) { + color = packedFGColor; + } + + if (shadow) { + super.drawString(fontRenderer, this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2, color); + } else { + fontRenderer.drawString(this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2F, color); + } + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java b/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java index 959b6ea2f..853835aef 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java @@ -216,30 +216,28 @@ public class ClientSetup { ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR); ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_PORTABLE_GRID); - RenderType cutout = RenderType.func_228643_e_(); - - RenderTypeLookup.setRenderLayer(RSBlocks.CONTROLLER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CREATIVE_CONTROLLER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CABLE, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER_MANAGER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_MONITOR, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.DETECTOR, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.DISK_MANIPULATOR, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.GRID, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_GRID, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.PATTERN_GRID, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.FLUID_GRID, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_RECEIVER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_TRANSMITTER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.RELAY, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.SECURITY_MANAGER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.WIRELESS_TRANSMITTER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR, cutout); - RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR, cutout); + RenderTypeLookup.setRenderLayer(RSBlocks.CONTROLLER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CREATIVE_CONTROLLER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CABLE, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER_MANAGER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_MONITOR, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.DETECTOR, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.DISK_MANIPULATOR, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.GRID, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_GRID, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.PATTERN_GRID, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.FLUID_GRID, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_RECEIVER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_TRANSMITTER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.RELAY, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.SECURITY_MANAGER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.WIRELESS_TRANSMITTER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR, RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR, RenderType.cutout()); ClientRegistry.bindTileEntityRenderer(RSTiles.STORAGE_MONITOR, StorageMonitorTileRenderer::new); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java index 3a219055b..d5885125b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java @@ -106,7 +106,7 @@ public class DiskDriveTile extends NetworkNodeTile { ListNBT list = new ListNBT(); for (DiskState state : getNode().getDiskState()) { - list.add(IntNBT.func_229692_a_(state.ordinal())); + list.add(IntNBT.valueOf(state.ordinal())); } tag.put(NBT_DISK_STATE, list); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java index 2849d18cf..1ee2d4363 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java @@ -63,7 +63,7 @@ public class DiskManipulatorTile extends NetworkNodeTile tooltipTextWidth) tooltipTextWidth = textLineWidth; @@ -148,8 +143,7 @@ public final class RenderUtils { int titleLinesCount = 1; int tooltipX = mouseX + 12; - if (tooltipX + tooltipTextWidth + 4 > screenWidth) - { + if (tooltipX + tooltipTextWidth + 4 > screenWidth) { tooltipX = mouseX - 16 - tooltipTextWidth; if (tooltipX < 4) // if the tooltip doesn't fit on the screen { @@ -161,25 +155,21 @@ public final class RenderUtils { } } - if (maxTextWidth > 0 && tooltipTextWidth > maxTextWidth) - { + if (maxTextWidth > 0 && tooltipTextWidth > maxTextWidth) { tooltipTextWidth = maxTextWidth; needsWrap = true; } - if (needsWrap) - { + if (needsWrap) { int wrappedTooltipWidth = 0; List wrappedTextLines = new ArrayList(); - for (int i = 0; i < textLines.size(); i++) - { + for (int i = 0; i < textLines.size(); i++) { String textLine = textLines.get(i); List wrappedLine = font.listFormattedStringToWidth(textLine, tooltipTextWidth); if (i == 0) titleLinesCount = wrappedLine.size(); - for (String line : wrappedLine) - { + for (String line : wrappedLine) { int lineWidth = font.getStringWidth(line); if (lineWidth > wrappedTooltipWidth) wrappedTooltipWidth = lineWidth; @@ -198,8 +188,7 @@ public final class RenderUtils { int tooltipY = mouseY - 12; int tooltipHeight = 8; - if (textLines.size() > 1) - { + if (textLines.size() > 1) { tooltipHeight += (textLines.size() - 1) * 10; if (textLines.size() > titleLinesCount) tooltipHeight += 2; // gap between title lines and next lines @@ -238,18 +227,17 @@ public final class RenderUtils { MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostBackground(stack, textLines, tooltipX, tooltipY, font, tooltipTextWidth, tooltipHeight)); - IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.func_228455_a_(Tessellator.getInstance().getBuffer()); + IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); MatrixStack textStack = new MatrixStack(); - textStack.func_227861_a_(0.0D, 0.0D, (double)zLevel); - Matrix4f textLocation = textStack.func_227866_c_().func_227870_a_(); + textStack.translate(0.0D, 0.0D, (double) zLevel); + Matrix4f textLocation = textStack.getLast().getPositionMatrix(); int tooltipTop = tooltipY; - for (int lineNumber = 0; lineNumber < textLines.size(); ++lineNumber) - { + for (int lineNumber = 0; lineNumber < textLines.size(); ++lineNumber) { String line = textLines.get(lineNumber); if (line != null) - font.func_228079_a_(line, (float)tooltipX, (float)tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); + font.renderString(line, (float) tooltipX, (float) tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); if (lineNumber + 1 == titleLinesCount) tooltipY += 2; @@ -257,7 +245,7 @@ public final class RenderUtils { tooltipY += 10; } - renderType.func_228461_a_(); + renderType.finish(); MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(stack, textLines, tooltipX, tooltipTop, font, tooltipTextWidth, tooltipHeight)); @@ -272,24 +260,24 @@ public final class RenderUtils { // FontRenderer#drawStringWithShadow - call to func_228078_a_ (private) MatrixStack smallTextStack = new MatrixStack(); - smallTextStack.func_227861_a_(0.0D, 0.0D, (double)zLevel); - smallTextStack.func_227862_a_(textScale, textScale, 1); + smallTextStack.translate(0.0D, 0.0D, (double) zLevel); + smallTextStack.scale(textScale, textScale, 1); - IRenderTypeBuffer.Impl lvt_7_1_ = IRenderTypeBuffer.func_228455_a_(Tessellator.getInstance().getBuffer()); - font.func_228079_a_( + IRenderTypeBuffer.Impl lvt_7_1_ = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + font.renderString( TextFormatting.GRAY + smallTextLines.get(i), RenderUtils.getOffsetOnScale(tooltipX, textScale), RenderUtils.getOffsetOnScale(y - (Minecraft.getInstance().getForceUnicodeFont() ? 2 : 0), textScale), -1, true, - smallTextStack.func_227866_c_().func_227870_a_(), + smallTextStack.getLast().getPositionMatrix(), lvt_7_1_, false, 0, 15728880 ); - lvt_7_1_.func_228461_a_(); + lvt_7_1_.finish(); y -= 9; } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 07ac216e2..1c5b0eb7e 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,3 +1,4 @@ protected net.minecraft.inventory.container.Container field_75153_a # inventoryItemStacks protected net.minecraft.inventory.container.Container field_75149_d # listeners protected net.minecraft.client.gui.widget.TextFieldWidget field_146212_n # canLoseFocus +public net.minecraft.client.gui.widget.button.CheckboxButton field_212943_a # checked diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f182ec9f8..9171c2653 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[30,)" +loaderVersion="[31,)" issueTrackerURL="https://github.com/raoulvdberge/refinedstorage" [[mods]] modId="refinedstorage"