From f46b2b6bc75481bd48aa612343eb7b5585394cab Mon Sep 17 00:00:00 2001 From: stfwi Date: Thu, 11 Jun 2020 13:59:48 +0200 Subject: [PATCH] 1.14/1.15: Delayed GUI button tooltips added. --- 1.12/readme.md | 2 + 1.14/gradle.properties | 2 +- 1.14/meta/update.json | 3 +- 1.14/readme.md | 2 + .../blocks/EdCraftingTable.java | 20 +++- .../wile/engineersdecor/blocks/EdDropper.java | 28 ++++- .../blocks/EdElectricalFurnace.java | 20 +++- .../wile/engineersdecor/blocks/EdHopper.java | 24 +++- .../wile/engineersdecor/blocks/EdPlacer.java | 22 +++- .../libmc/detail/TooltipDisplay.java | 103 ++++++++++++++++ .../assets/engineersdecor/lang/en_us.json | 28 +++++ .../assets/engineersdecor/lang/ru_ru.json | 28 +++++ .../assets/engineersdecor/lang/zh_cn.json | 28 +++++ 1.15/gradle.properties | 6 +- 1.15/meta/update.json | 3 +- 1.15/readme.md | 3 + .../java/wile/engineersdecor/ModConfig.java | 3 + .../java/wile/engineersdecor/ModContent.java | 8 +- .../wile/engineersdecor/blocks/EdChair.java | 2 +- .../blocks/EdCraftingTable.java | 20 +++- .../wile/engineersdecor/blocks/EdDropper.java | 111 ++++++++++++++---- .../blocks/EdElectricalFurnace.java | 20 +++- .../engineersdecor/blocks/EdFluidFunnel.java | 33 +++++- .../engineersdecor/blocks/EdGroundBlock.java | 20 ++++ .../wile/engineersdecor/blocks/EdHopper.java | 25 +++- .../engineersdecor/blocks/EdLabeledCrate.java | 2 +- .../engineersdecor/blocks/EdLadderBlock.java | 2 +- .../wile/engineersdecor/blocks/EdMilker.java | 56 ++++++--- .../blocks/EdMineralSmelter.java | 2 +- .../wile/engineersdecor/blocks/EdPlacer.java | 21 +++- .../libmc/blocks/StandardBlocks.java | 4 +- .../libmc/detail/Inventories.java | 21 +++- .../libmc/detail/SidedProxy.java | 5 +- .../libmc/detail/TooltipDisplay.java | 103 ++++++++++++++++ .../blockstates/dense_grit_dirt_block.json | 14 +++ .../assets/engineersdecor/lang/en_us.json | 34 +++++- .../assets/engineersdecor/lang/ru_ru.json | 32 +++++ .../assets/engineersdecor/lang/zh_cn.json | 32 +++++ .../block/soil/dense_grit_dirt_model0.json | 1 + .../block/soil/dense_grit_dirt_model1.json | 1 + .../block/soil/dense_grit_dirt_model2.json | 1 + .../block/soil/dense_grit_dirt_model3.json | 1 + .../block/soil/dense_grit_dirt_model4.json | 1 + .../block/soil/dense_grit_dirt_model5.json | 1 + .../block/soil/dense_grit_dirt_model6.json | 1 + .../block/soil/dense_grit_dirt_model7.json | 1 + .../models/item/dense_grit_dirt_block.json | 1 + .../block/soil/dense_grit_dirt_texture0.png | Bin 0 -> 837 bytes .../block/soil/dense_grit_dirt_texture1.png | Bin 0 -> 803 bytes .../block/soil/dense_grit_dirt_texture2.png | Bin 0 -> 812 bytes .../block/soil/dense_grit_dirt_texture3.png | Bin 0 -> 766 bytes .../block/soil/dense_grit_dirt_texture4.png | Bin 0 -> 758 bytes .../block/soil/dense_grit_dirt_texture5.png | Bin 0 -> 775 bytes .../block/soil/dense_grit_dirt_texture6.png | Bin 0 -> 808 bytes .../block/soil/dense_grit_dirt_texture7.png | Bin 0 -> 784 bytes .../dense_grit_sand_dirt_recipe.json | 23 ++++ .../data/forge/tags/blocks/dirt.json | 6 + .../resources/data/forge/tags/items/dirt.json | 6 + meta/update.json | 6 +- 59 files changed, 852 insertions(+), 90 deletions(-) create mode 100644 1.14/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java create mode 100644 1.15/src/main/java/wile/engineersdecor/blocks/EdGroundBlock.java create mode 100644 1.15/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java create mode 100644 1.15/src/main/resources/assets/engineersdecor/blockstates/dense_grit_dirt_block.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model0.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model1.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model2.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model3.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model4.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model5.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model6.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/block/soil/dense_grit_dirt_model7.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/models/item/dense_grit_dirt_block.json create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture0.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture1.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture2.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture3.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture4.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture5.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture6.png create mode 100644 1.15/src/main/resources/assets/engineersdecor/textures/block/soil/dense_grit_dirt_texture7.png create mode 100644 1.15/src/main/resources/data/engineersdecor/recipes/dependent/dense_grit_sand_dirt_recipe.json create mode 100644 1.15/src/main/resources/data/forge/tags/blocks/dirt.json create mode 100644 1.15/src/main/resources/data/forge/tags/items/dirt.json diff --git a/1.12/readme.md b/1.12/readme.md index d4943a9..a68dfa5 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history + ~ v1.1.0-b2 [F] + - v1.1.0-b1 [F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace). [M] Changed Labeled Crate Nesting to circumvent server crashing in combination with the Sponge mod. diff --git a/1.14/gradle.properties b/1.14/gradle.properties index 8cc8796..596b254 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.14.4 version_forge_minecraft=1.14.4-28.2.3 version_fml_mappings=20190719-1.14.3 version_jei=1.14.4:6.0.0.10 -version_engineersdecor=1.1.0-b1 +version_engineersdecor=1.1.0-b2 diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 2be7c45..81fb084 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.4": { + "1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).", "1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[A] Sheet Metal Slab Slices added (only available if IE is installed).\n[M] Config options extended/updated.\n[M] Dense Grit Sand textures altered to get slightly more visible structure from distance.", "1.0.20-b7": "[A] Dense Grit Sand added.\n[!] Variant Slab compatibility fix. *This may alter placed slabs of this mod, data fixers don't work yet unfortunately*.", "1.0.20-b6": "[M] Slab Slice placement improved.\n[M] Quite some naming/refractoring under the hood.", @@ -57,6 +58,6 @@ }, "promos": { "1.14.4-recommended": "", - "1.14.4-latest": "1.1.0-b1" + "1.14.4-latest": "1.1.0-b2" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 1a28556..06cfe50 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.14.4. ## Version history + - v1.1.0-b2 [A] Added tooltips for buttons/settings in device GUIs (1.5s display delay). + - v1.1.0-b1 [F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace). [A] Sheet Metal Slab Slices added (only available if IE is installed). [M] Config options extended/updated. diff --git a/1.14/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java b/1.14/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java index a3b3468..050e683 100644 --- a/1.14/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java +++ b/1.14/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java @@ -22,6 +22,8 @@ import wile.engineersdecor.libmc.detail.Auxiliaries; import wile.engineersdecor.libmc.detail.Inventories; import wile.engineersdecor.libmc.detail.Inventories.SlotRange; import wile.engineersdecor.libmc.detail.Networking; +import wile.engineersdecor.libmc.detail.TooltipDisplay; +import wile.engineersdecor.libmc.detail.TooltipDisplay.TipRange; import net.minecraft.inventory.container.*; import net.minecraft.network.play.server.SSetSlotPacket; import net.minecraft.network.NetworkManager; @@ -59,6 +61,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import com.mojang.blaze3d.platform.GlStateManager; import com.google.common.collect.ImmutableList; + import javax.annotation.Nullable; import java.util.*; import java.util.stream.Collectors; @@ -1106,6 +1109,7 @@ public class EdCraftingTable protected final PlayerEntity player; protected final ArrayList