From 98a0f0b734727697c9e8072ee08842175ddbf539 Mon Sep 17 00:00:00 2001 From: Quantizr Date: Sun, 13 Dec 2020 23:21:43 -0800 Subject: Added Prevent Placing FoT/Spirit Sceptre on grass/dirt --- src/main/java/me/Danker/DankersSkyblockMod.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/main/java/me/Danker/DankersSkyblockMod.java') diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index 64a1f5b..a148574 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -2861,6 +2861,11 @@ public class DankersSkyblockMod Blocks.oak_door, Blocks.skull )); + ArrayList flowerPlaceable = new ArrayList<>(Arrays.asList( + Blocks.grass, + Blocks.dirt, + Blocks.flower_pot + )); if (Utils.inDungeons) { interactables.add(Blocks.coal_block); interactables.add(Blocks.stained_hardened_clay); @@ -2873,6 +2878,14 @@ public class DankersSkyblockMod event.setCanceled(true); } } + if(flowerPlaceable.contains(block)){ + if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Flower of Truth")) { + event.setCanceled(true); + } + if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Spirit Sceptre")) { + event.setCanceled(true); + } + } } } -- cgit From b161c4dec6ee6a05c769d407bbd51a43bff4b4d6 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Thu, 17 Dec 2020 11:00:09 -0500 Subject: Fix icons rendering with tints --- README.md | 4 +++- build.gradle | 2 +- src/main/java/me/Danker/DankersSkyblockMod.java | 2 +- src/main/java/me/Danker/commands/ToggleCommand.java | 3 ++- src/main/java/me/Danker/handlers/TextRenderer.java | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java/me/Danker/DankersSkyblockMod.java') diff --git a/README.md b/README.md index bbf50bd..e251a76 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Discord Server: https://discord.gg/QsEkNQS - Golden T10/T6/T4 enchant display - Block AOTD ability - Block Livid Dagger ability +- Block placing Flower of Truth/Spirit Sceptre on dirt/grass - Disable Spirit Sceptre messages - Disable Midas Staff messages - Disable Implosion messages @@ -34,6 +35,7 @@ Discord Server: https://discord.gg/QsEkNQS - Catacombs F7 Stage 3 solvers (Starts with letter, select all colour, ignore arrows on sea lanterns) - Find correct Livid (with graphic display of HP) - Experimentation solvers (Ultrasequencer, Chronomatron, Superpairs) +- Hide tooltips in experiment addons - Pet background colors based on level - Golem spawning alerts - Skill xp/hour tracker @@ -47,7 +49,7 @@ Discord Server: https://discord.gg/QsEkNQS ## Commands - /dhelp - Returns this message in-game. - /dsm - Opens the GUI for Danker's Skyblock Mod. -- /toggle - Toggles features. /toggle list returns values of every toggle. +- /toggle - Toggles features. /toggle list returns values of every toggle. - /setkey - Sets API key. - /getkey - Returns key set with /setkey and copies it to your clipboard. - /loot [winter/spooky/f(1-7)/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead. diff --git a/build.gradle b/build.gradle index d046b38..441a4db 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" } */ -version = "1.8.5-beta4" +version = "1.8.5-beta5" group= "me.Danker.DankersSkyblockMod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Danker's Skyblock Mod" diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index 86d2087..563e466 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -78,7 +78,7 @@ import java.util.regex.Pattern; public class DankersSkyblockMod { public static final String MODID = "Danker's Skyblock Mod"; - public static final String VERSION = "1.8.5-beta3"; + public static final String VERSION = "1.8.5-beta5"; static double checkItemsNow = 0; static double itemsChecked = 0; diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java index dab4ce2..15693ef 100644 --- a/src/main/java/me/Danker/commands/ToggleCommand.java +++ b/src/main/java/me/Danker/commands/ToggleCommand.java @@ -71,7 +71,8 @@ public class ToggleCommand extends CommandBase implements ICommand { "aotd/lividdagger/flowerweapons/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" + "outlinetext/midasstaffmessages/implosionmessages/healmessages/caketimer/lowhealthnotify/" + "lividsolver/stopsalvagestarred/notifyslayerslain/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" + - "watchermessage/startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/list>"; + "watchermessage/startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/" + + "itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/list>"; } @Override diff --git a/src/main/java/me/Danker/handlers/TextRenderer.java b/src/main/java/me/Danker/handlers/TextRenderer.java index cbf196b..769d164 100644 --- a/src/main/java/me/Danker/handlers/TextRenderer.java +++ b/src/main/java/me/Danker/handlers/TextRenderer.java @@ -3,6 +3,7 @@ package me.Danker.handlers; import me.Danker.commands.ToggleCommand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StringUtils; import org.lwjgl.opengl.GL11; @@ -26,5 +27,6 @@ public class TextRenderer extends Gui { } } GL11.glScaled(scaleReset, scaleReset, scaleReset); + GlStateManager.color(1, 1, 1, 1); } } -- cgit From a8c0c52d863d93e2edc737a8642cd4244d55e240 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Thu, 17 Dec 2020 11:09:07 -0500 Subject: Add tallgrass to block placing flower weapons --- README.md | 2 +- src/main/java/me/Danker/DankersSkyblockMod.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/Danker/DankersSkyblockMod.java') diff --git a/README.md b/README.md index e251a76..703499e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Discord Server: https://discord.gg/QsEkNQS - Golden T10/T6/T4 enchant display - Block AOTD ability - Block Livid Dagger ability -- Block placing Flower of Truth/Spirit Sceptre on dirt/grass +- Block placing Flower of Truth/Spirit Sceptre - Disable Spirit Sceptre messages - Disable Midas Staff messages - Disable Implosion messages diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index 563e466..bfd776d 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -1206,7 +1206,7 @@ public class DankersSkyblockMod public void renderEverything() { if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return; - + Minecraft mc = Minecraft.getMinecraft(); if (ToggleCommand.coordsToggled) { @@ -2891,7 +2891,9 @@ public class DankersSkyblockMod ArrayList flowerPlaceable = new ArrayList<>(Arrays.asList( Blocks.grass, Blocks.dirt, - Blocks.flower_pot + Blocks.flower_pot, + Blocks.tallgrass, + Blocks.double_plant )); if (Utils.inDungeons) { interactables.add(Blocks.coal_block); -- cgit