Skip to content

Mp fix #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
akirapriva wants to merge 11 commits into from
Closed

Mp fix #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
95512a6
Update to latest GT6 and fix recipe in multiplayer
akirapriva Feb 28, 2026
327c65d
revert crucibleinterior
akirapriva Feb 28, 2026
af85892
revert smallcrucible
akirapriva Feb 28, 2026
56fd597
revert mteenginediesel
akirapriva Feb 28, 2026
4079aa5
revert dependencies
akirapriva Feb 28, 2026
4e3cbc6
some little arrangements to fix my weird code
akirapriva Feb 28, 2026
dca2124
request
akirapriva Mar 1, 2026
74f66a9
Merge branch 'mp-fix' of https://github.com/akirapriva/gt6x into mp-fix
akirapriva Mar 1, 2026
ee2a566
change request
akirapriva Mar 1, 2026
4da5a3d
fix closing class too early
akirapriva Mar 1, 2026
79af139
reformat
akirapriva Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/org/altadoon/gt6x/Gt6xMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package org.altadoon.gt6x;

import cpw.mods.fml.common.FMLCommonHandler;
import gregapi.data.CS;
import gregapi.data.MD;
import org.altadoon.gt6x.common.*;
import org.altadoon.gt6x.common.items.ItemMaterialDisplay;
import org.altadoon.gt6x.common.items.MultiItemBottlesX;
import org.altadoon.gt6x.common.items.MultiItemsX;
import org.altadoon.gt6x.common.items.Tools;
Expand Down Expand Up @@ -121,6 +123,10 @@ public void onModInit2(cpw.mods.fml.common.event.FMLInitializationEvent event) {
for (GT6XFeature feature : enabledFeatures) {
feature.init();
}

if (FMLCommonHandler.instance().getSide().isClient()) {
ItemMaterialDisplay.initClientNEI();
}
}

@Override
Expand Down
87 changes: 53 additions & 34 deletions src/main/java/org/altadoon/gt6x/common/items/ItemMaterialDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
import codechicken.nei.guihook.IContainerInputHandler;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregapi.data.*;
import gregapi.gui.ContainerClient;
import gregapi.item.IItemGT;
import gregapi.oredict.OreDictMaterial;
import gregapi.oredict.OreDictMaterialStack;
import gregapi.util.OM;
import gregapi.util.ST;
import gregapi.util.UT;
import gregapi.gui.ContainerClient;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
Expand Down Expand Up @@ -94,7 +95,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
list.add(LH.Chat.BLINKING_RED + "CLIENTSIDE MATERIAL IS NULL!!!");
}

list.add(LH.Chat.BLUE + String.format("Content: %.3f Units of %s", (double)mat.mAmount / U, mat.mMaterial.getLocal()));
list.add(LH.Chat.BLUE + String.format("Content: %.3f Units of %s", (double) mat.mAmount / U, mat.mMaterial.getLocal()));

if (mat.mMaterial.mTooltipChemical != null) {
list.add(LH.Chat.YELLOW + mat.mMaterial.mTooltipChemical);
Expand All @@ -105,7 +106,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
list.add(LH.Chat.WHITE + "State: " + (
temperature < mat.mMaterial.mMeltingPoint ? "solid" :
temperature < mat.mMaterial.mBoilingPoint ? "liquid" :
temperature < mat.mMaterial.mPlasmaPoint ? "gas" :
temperature < mat.mMaterial.mPlasmaPoint ? "gas" :
"plasma"
));
}
Expand Down Expand Up @@ -177,20 +178,26 @@ public String getItemStackDisplayName(ItemStack stack) {
return mat.mMaterial.getLocal();
}

@Override public final Item setUnlocalizedName(String aName) {return this;}
@Override public final String getUnlocalizedName() {return name;}
@Override public ItemStack getContainerItem(ItemStack aStack) {
return null;
}
@Override public final boolean hasContainerItem(ItemStack aStack) {
return false;
}
@Override
public final Item setUnlocalizedName(String aName) {return this;}

@Override
public final String getUnlocalizedName() {return name;}

@Override
public ItemStack getContainerItem(ItemStack aStack){return null;}

static {
@Override
public final boolean hasContainerItem(ItemStack aStack) {return false;}

@SideOnly(Side.CLIENT)
public static void initClientNEI() {
if (!Loader.isModLoaded("NotEnoughItems")) return;
GuiContainerManager.addInputHandler(new ItemMaterialDisplayNeiHandler());
}

public static class ItemMaterialDisplayNeiHandler implements IContainerInputHandler {
@SideOnly(Side.CLIENT)
static class ItemMaterialDisplayNeiHandler implements IContainerInputHandler {
protected boolean canHandle(GuiContainer gui) {
return gui instanceof ContainerClient;
}
Expand All @@ -199,53 +206,65 @@ protected boolean showUsages(ItemStack stackover) {
OreDictMaterial mat = ItemMaterialDisplay.UnDisplay(stackover).mMaterial;
if (mat != MT.NULL)
return GuiUsageRecipe.openRecipeGui("item", OP.dust.mat(mat, 1));

return false;
}

protected boolean showRecipes(ItemStack stackover) {
OreDictMaterial mat = ItemMaterialDisplay.UnDisplay(stackover).mMaterial;
if (mat != MT.NULL)
return GuiCraftingRecipe.openRecipeGui("item", OP.ingot.mat(mat, 1));

return false;
}

@Override
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
if (stackover == null)
return false;
if(keyCode == NEIClientConfig.getKeyBinding("gui.usage") || (keyCode == NEIClientConfig.getKeyBinding("gui.recipe") && NEIClientUtils.shiftKey()))
if (stackover == null) return false;

if (keyCode == NEIClientConfig.getKeyBinding("gui.usage")
|| (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")
&& NEIClientUtils.shiftKey()))
return showRecipes(stackover);
if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe"))

if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe"))
return showUsages(stackover);

return false;
}

@Override
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
if (!canHandle(gui))
return false;
if (!canHandle(gui)) return false;

ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
if (stackover == null)
return false;
if (button == 0)
return showRecipes(stackover);
if (button == 1)
return showUsages(stackover);
if (stackover == null) return false;

if (button == 0) return showRecipes(stackover);
if (button == 1) return showUsages(stackover);

return false;
}

@Override
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
}

@Override
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {return false;}

@Override public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
@Override public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { return false; }
@Override public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}
@Override public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
@Override public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; }
@Override public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
@Override public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
@Override
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}

@Override
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}

@Override
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {return false;}

@Override
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}

@Override
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
}
}
10 changes: 5 additions & 5 deletions src/main/java/org/altadoon/gt6x/features/ceramics/Ceramics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ private void addMTEs() {
private void addRecipes() {
// Fire clay
RM.Mixer.addRecipe2(true, 16, 192, dust.mat(MT.Kaolinite, 2), dust.mat(MT.Graphite, 1), dust.mat(MTx.Fireclay, 3));
for (FluidStack water : FL.waters(125, 100)) {
RM.Mixer.addRecipe2(true, 16, 192, IL.Clay_Ball_White.get(2), dust.mat(MT.Graphite, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(3));
RM.Mixer.addRecipe1(true, 16, 64, dust.mat(MTx.RefractoryCeramic, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(1));
RM.Bath.addRecipe1(true, 0, 64, dust.mat(MTx.Fireclay, 1), water, NF, ILx.Fireclay_Ball.get(1));
}
for (FluidStack water : FL.waters(125, 100)) {
RM.Mixer.addRecipe2(true, 16, 192, IL.Clay_Ball_White.get(2), dust.mat(MT.Graphite, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(3));
RM.Mixer.addRecipe1(true, 16, 64, dust.mat(MTx.RefractoryCeramic, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(1));
RM.Bath.addRecipe1(true, 0, 64, dust.mat(MTx.Fireclay, 1), water, NF, ILx.Fireclay_Ball.get(1));}

RM.Furnace.addRecipe1(true, 16, 64, dust.mat(MTx.Fireclay, 1), ingot.mat(MTx.Firebrick, 1));

// Magnesia-Carbon
Expand Down