mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-22 12:59:40 +00:00
Button works!
This commit is contained in:
1 parent
b51bff6772
commit
4ec705dd74
6 files changed
+26
-15
No files matched your search
@@ -72,7 +72,7 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
|
|||||||
}
|
}
|
||||||
else if( this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn )
|
else if( this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn )
|
||||||
{
|
{
|
||||||
FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Prioritize", this.fluidPrioritizedEnabledBtn == btn ? PRIORITY_DISABLE : PRIORITY_ENABLE ) );
|
FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Prioritize", container.prioritize ? PRIORITY_DISABLE : PRIORITY_ENABLE ) );
|
||||||
}
|
}
|
||||||
else if( this.invertBtn == btn )
|
else if( this.invertBtn == btn )
|
||||||
{
|
{
|
||||||
@@ -146,14 +146,14 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
|
|||||||
}
|
}
|
||||||
if( this.container.prioritize )
|
if( this.container.prioritize )
|
||||||
{
|
{
|
||||||
this.fluidPrioritizedEnabledBtn.visible = true;
|
this.fluidPrioritizedEnabledBtn.visible = false;
|
||||||
this.fluidPrioritizedDisabledBtn.visible = false;
|
this.fluidPrioritizedDisabledBtn.visible = true;
|
||||||
// MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("ENABLED"));
|
// MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("ENABLED"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.fluidPrioritizedEnabledBtn.visible = false;
|
this.fluidPrioritizedEnabledBtn.visible = true;
|
||||||
this.fluidPrioritizedDisabledBtn.visible = true;
|
this.fluidPrioritizedDisabledBtn.visible = false;
|
||||||
//MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("DISABLED"));
|
//MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("DISABLED"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -310,6 +310,7 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp
|
|||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
this.substitute = this.patternTerminal.isSubstitution();
|
this.substitute = this.patternTerminal.isSubstitution();
|
||||||
|
this.prioritize = this.patternTerminal.isPrioritize();
|
||||||
if (inverted != patternTerminal.isInverted() || activePage != patternTerminal.getActivePage()) {
|
if (inverted != patternTerminal.isInverted() || activePage != patternTerminal.getActivePage()) {
|
||||||
inverted = patternTerminal.isInverted();
|
inverted = patternTerminal.isInverted();
|
||||||
activePage = patternTerminal.getActivePage();
|
activePage = patternTerminal.getActivePage();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
|
|||||||
private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 );
|
private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 );
|
||||||
|
|
||||||
private boolean substitute = false;
|
private boolean substitute = false;
|
||||||
private boolean priorization = false;
|
private boolean prioritize = false;
|
||||||
private boolean inverted = false;
|
private boolean inverted = false;
|
||||||
private int activePage = 0;
|
private int activePage = 0;
|
||||||
|
|
||||||
@@ -97,7 +97,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
|
|||||||
this.pattern.writeToNBT( data, "pattern" );
|
this.pattern.writeToNBT( data, "pattern" );
|
||||||
this.output.writeToNBT( data, "outputList" );
|
this.output.writeToNBT( data, "outputList" );
|
||||||
this.crafting.writeToNBT( data, "craftingGrid" );
|
this.crafting.writeToNBT( data, "craftingGrid" );
|
||||||
data.setBoolean("priorization", this.priorization);
|
data.setBoolean("priorization", this.prioritize);
|
||||||
data.setBoolean( "substitute", this.substitute );
|
data.setBoolean( "substitute", this.substitute );
|
||||||
data.setBoolean( "inverted", this.inverted );
|
data.setBoolean( "inverted", this.inverted );
|
||||||
data.setInteger( "activePage", this.activePage );
|
data.setInteger( "activePage", this.activePage );
|
||||||
@@ -206,13 +206,18 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
|
|||||||
return this.substitute;
|
return this.substitute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isPrioritize()
|
||||||
|
{
|
||||||
|
return this.prioritize;
|
||||||
|
}
|
||||||
|
|
||||||
public void setSubstitution( boolean canSubstitute )
|
public void setSubstitution( boolean canSubstitute )
|
||||||
{
|
{
|
||||||
this.substitute = canSubstitute;
|
this.substitute = canSubstitute;
|
||||||
}
|
}
|
||||||
public void setPrioritization( boolean canPrioritize )
|
public void setPrioritization( boolean canPrioritize )
|
||||||
{
|
{
|
||||||
this.priorization = canPrioritize;
|
this.prioritize = canPrioritize;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onChangeCrafting(IAEItemStack[] newCrafting, IAEItemStack[] newOutput) {
|
public void onChangeCrafting(IAEItemStack[] newCrafting, IAEItemStack[] newOutput) {
|
||||||
|
|||||||
+7
-1
@@ -4,8 +4,10 @@ import codechicken.nei.api.IOverlayHandler;
|
|||||||
import codechicken.nei.recipe.IRecipeHandler;
|
import codechicken.nei.recipe.IRecipeHandler;
|
||||||
import codechicken.nei.recipe.TemplateRecipeHandler;
|
import codechicken.nei.recipe.TemplateRecipeHandler;
|
||||||
import com.glodblock.github.FluidCraft;
|
import com.glodblock.github.FluidCraft;
|
||||||
|
import com.glodblock.github.client.gui.GuiBaseFluidPatternTerminalEx;
|
||||||
import com.glodblock.github.client.gui.GuiFluidPatternTerminal;
|
import com.glodblock.github.client.gui.GuiFluidPatternTerminal;
|
||||||
import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx;
|
import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx;
|
||||||
|
import com.glodblock.github.client.gui.container.FluidPrioritization;
|
||||||
import com.glodblock.github.nei.object.OrderStack;
|
import com.glodblock.github.nei.object.OrderStack;
|
||||||
import com.glodblock.github.nei.recipes.FluidRecipe;
|
import com.glodblock.github.nei.recipes.FluidRecipe;
|
||||||
import com.glodblock.github.network.CPacketTransferRecipe;
|
import com.glodblock.github.network.CPacketTransferRecipe;
|
||||||
@@ -30,7 +32,11 @@ public class FluidPatternTerminalRecipeTransferHandler implements IOverlayHandle
|
|||||||
@Override
|
@Override
|
||||||
public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) {
|
public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) {
|
||||||
if (isCorrectGui(firstGui)) {
|
if (isCorrectGui(firstGui)) {
|
||||||
List<OrderStack<?>> in = FluidRecipe.getPackageInputs(recipe, recipeIndex);
|
boolean priority = false;
|
||||||
|
if (firstGui instanceof GuiBaseFluidPatternTerminalEx) {
|
||||||
|
priority = ((GuiBaseFluidPatternTerminalEx)firstGui).container.prioritize;
|
||||||
|
}
|
||||||
|
List<OrderStack<?>> in = FluidRecipe.getPackageInputs(recipe, recipeIndex, priority);
|
||||||
List<OrderStack<?>> out = FluidRecipe.getPackageOutputs(recipe, recipeIndex, !notUseOther(recipe));
|
List<OrderStack<?>> out = FluidRecipe.getPackageOutputs(recipe, recipeIndex, !notUseOther(recipe));
|
||||||
boolean craft = shouldCraft(recipe);
|
boolean craft = shouldCraft(recipe);
|
||||||
FluidCraft.proxy.netHandler.sendToServer(new CPacketTransferRecipe(in, out, craft));
|
FluidCraft.proxy.netHandler.sendToServer(new CPacketTransferRecipe(in, out, craft));
|
||||||
|
|||||||
@@ -32,18 +32,14 @@ public final class FluidRecipe {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<OrderStack<?>> getPackageInputs(IRecipeHandler recipe, int index) {
|
public static List<OrderStack<?>> getPackageInputs(IRecipeHandler recipe, int index, boolean priority) {
|
||||||
TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe;
|
TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe;
|
||||||
if (tRecipe == null || !IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return new ArrayList<>();
|
if (tRecipe == null || !IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return new ArrayList<>();
|
||||||
if (tRecipe.getOverlayIdentifier() == null) return getPackageInputsLegacy(recipe, index);
|
if (tRecipe.getOverlayIdentifier() == null) return getPackageInputsLegacy(recipe, index);
|
||||||
IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier());
|
IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier());
|
||||||
if (extractor == null) return new ArrayList<>();
|
if (extractor == null) return new ArrayList<>();
|
||||||
List<PositionedStack> tmp = new ArrayList<>(tRecipe.getIngredientStacks(index));
|
List<PositionedStack> tmp = new ArrayList<>(tRecipe.getIngredientStacks(index));
|
||||||
FluidPrioritization fluid = FluidPrioritization.ENABLED;
|
if (priority) {
|
||||||
switch(fluid) {
|
|
||||||
case ENABLED:
|
|
||||||
MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("hi"));
|
|
||||||
|
|
||||||
for (int i = 0; i < tmp.size(); i++) {
|
for (int i = 0; i < tmp.size(); i++) {
|
||||||
if(tmp.get(i).toString().contains("GregTech_FluidDisplay")) {
|
if(tmp.get(i).toString().contains("GregTech_FluidDisplay")) {
|
||||||
MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(String.valueOf(tmp.size())));
|
MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(String.valueOf(tmp.size())));
|
||||||
|
|||||||
@@ -106,6 +106,9 @@ public class CPacketFluidPatternTermBtns implements IMessage {
|
|||||||
case "PatternTerminalEx.ActivePage":
|
case "PatternTerminalEx.ActivePage":
|
||||||
cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value));
|
cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value));
|
||||||
break;
|
break;
|
||||||
|
case "PatternTerminalEx.Prioritize":
|
||||||
|
cpt.getPatternTerminal().setPrioritization(Value.equals("1"));
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
} else if(Name.equals( "Terminal.Cpu" ) && c instanceof ContainerFluidCraftConfirm) {
|
} else if(Name.equals( "Terminal.Cpu" ) && c instanceof ContainerFluidCraftConfirm) {
|
||||||
final ContainerFluidCraftConfirm qk = (ContainerFluidCraftConfirm) c;
|
final ContainerFluidCraftConfirm qk = (ContainerFluidCraftConfirm) c;
|
||||||
|
|||||||
Reference in new issue
Block a user