mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
ow
This commit is contained in:
parent
8d7046dac3
commit
2c0c57d174
@ -550,6 +550,8 @@ public class OreDictManager {
|
|||||||
OreDictionary.registerOre("dyeBrown", fromOne(oil_tar, EnumTarType.WOOD));
|
OreDictionary.registerOre("dyeBrown", fromOne(oil_tar, EnumTarType.WOOD));
|
||||||
OreDictionary.registerOre("dyeCyan", fromOne(oil_tar, EnumTarType.WAX));
|
OreDictionary.registerOre("dyeCyan", fromOne(oil_tar, EnumTarType.WAX));
|
||||||
OreDictionary.registerOre("dye", new ItemStack(oil_tar, 1, OreDictionary.WILDCARD_VALUE));
|
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_boron);
|
||||||
OreDictionary.registerOre("blockGlass", glass_lead);
|
OreDictionary.registerOre("blockGlass", glass_lead);
|
||||||
|
|||||||
@ -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()) {
|
if(!Mouse.isButtonDown(0) && !Mouse.isButtonDown(1) && Mouse.next()) {
|
||||||
int scroll = Mouse.getEventDWheel();
|
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
|
@Override
|
||||||
protected void mouseClicked(int x, int y, int k) {
|
protected void mouseClicked(int x, int y, int k) {
|
||||||
super.mouseClicked(x, y, k);
|
super.mouseClicked(x, y, k);
|
||||||
|
|||||||
@ -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.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.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.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.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.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)));
|
recipes.put(Fluids.COLLOID, new MixerRecipe(500, 20).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.dust)));
|
||||||
|
|||||||
@ -32,6 +32,11 @@ public class AnvilSmithingMold extends AnvilSmithingRecipe {
|
|||||||
List<String> names = ItemStackUtil.getOreDictNames(left);
|
List<String> names = ItemStackUtil.getOreDictNames(left);
|
||||||
|
|
||||||
for(String name : names) {
|
for(String name : names) {
|
||||||
|
|
||||||
|
if(matchesPrefix.name.equals("plate") && name.startsWith("plateTriple")) { //fuck me
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if(name.startsWith(matchesPrefix.name)) {
|
if(name.startsWith(matchesPrefix.name)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,7 +3,7 @@ package com.hbm.lib;
|
|||||||
public class RefStrings {
|
public class RefStrings {
|
||||||
public static final String MODID = "hbm";
|
public static final String MODID = "hbm";
|
||||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
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:
|
//HBM's Beta Naming Convention:
|
||||||
//V T (X)
|
//V T (X)
|
||||||
//V -> next release version
|
//V -> next release version
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user