From 2c0c57d1740ea3e0c7119d47d4e5cb562c88dd19 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 19 Mar 2023 22:03:29 +0100 Subject: [PATCH] ow --- .../java/com/hbm/inventory/OreDictManager.java | 2 ++ .../java/com/hbm/inventory/gui/GUIAnvil.java | 18 +++++++++++++++++- .../hbm/inventory/recipes/MixerRecipes.java | 2 +- .../recipes/anvil/AnvilSmithingMold.java | 5 +++++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index b3fc0cdc7..b6c84d700 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -550,6 +550,8 @@ public class OreDictManager { OreDictionary.registerOre("dyeBrown", fromOne(oil_tar, EnumTarType.WOOD)); OreDictionary.registerOre("dyeCyan", fromOne(oil_tar, EnumTarType.WAX)); OreDictionary.registerOre("dye", new ItemStack(oil_tar, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("dyeOrange", powder_cadmium); + OreDictionary.registerOre("dye", powder_cadmium); OreDictionary.registerOre("blockGlass", glass_boron); OreDictionary.registerOre("blockGlass", glass_lead); diff --git a/src/main/java/com/hbm/inventory/gui/GUIAnvil.java b/src/main/java/com/hbm/inventory/gui/GUIAnvil.java index 499688aff..b9f77897d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAnvil.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAnvil.java @@ -146,7 +146,7 @@ public class GUIAnvil extends GuiContainer { } } - if(guiLeft <= x && guiLeft + xSize > x && guiTop < y && guiTop + ySize >= y) { + if(guiLeft <= x && guiLeft + xSize > x && guiTop < y && guiTop + ySize >= y && getSlotAtPosition(x, y) == null) { if(!Mouse.isButtonDown(0) && !Mouse.isButtonDown(1) && Mouse.next()) { int scroll = Mouse.getEventDWheel(); @@ -156,6 +156,22 @@ public class GUIAnvil extends GuiContainer { } } + private Slot getSlotAtPosition(int x, int y) { + for(int k = 0; k < this.inventorySlots.inventorySlots.size(); ++k) { + Slot slot = (Slot) this.inventorySlots.inventorySlots.get(k); + + if(this.isMouseOverSlot(slot, x, y)) { + return slot; + } + } + + return null; + } + + private boolean isMouseOverSlot(Slot slot, int x, int y) { + return this.func_146978_c(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, x, y); + } + @Override protected void mouseClicked(int x, int y, int k) { super.mouseClicked(x, y, k); diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index dffd4636b..4b039c816 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -30,7 +30,7 @@ public class MixerRecipes extends SerializableRecipe { recipes.put(Fluids.COOLANT, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.WATER, 1_800)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.CRYOGEL, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.COOLANT, 1_800)).setSolid(new ComparableStack(ModItems.powder_ice))); recipes.put(Fluids.NITAN, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 600)).setStack2(new FluidStack(Fluids.MERCURY, 200)).setSolid(new ComparableStack(ModItems.powder_nitan_mix))); - recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 900)).setStack2(new FluidStack(Fluids.PETROLEUM, 100))); recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(DIAMOND.dust()))); recipes.put(Fluids.SALIENT, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.SEEDSLURRY, 500)).setStack2(new FluidStack(Fluids.BLOOD, 500))); recipes.put(Fluids.COLLOID, new MixerRecipe(500, 20).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.dust))); diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingMold.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingMold.java index 899e1725c..a20bdbe4f 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingMold.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingMold.java @@ -32,6 +32,11 @@ public class AnvilSmithingMold extends AnvilSmithingRecipe { List names = ItemStackUtil.getOreDictNames(left); for(String name : names) { + + if(matchesPrefix.name.equals("plate") && name.startsWith("plateTriple")) { //fuck me + return false; + } + if(name.startsWith(matchesPrefix.name)) { return true; } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 58b15e72d..05c653fc2 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4543)"; + public static final String VERSION = "1.0.27 BETA (4543H1)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version