Skip to content

修复小bug #28

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

Merged
RealSilverMoon merged 3 commits into from
Feb 7, 2025
Merged

修复小bug #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
141ca48
spotless 健忘症犯了 本地重复加载配方修复remake
luomolhx Dec 31, 2024
1a3ca77
Merge branch 'RealSilverMoon:master' into master
luomolhx Jan 4, 2025
7fc3d0f
spotless 修复nei导入配方，当配方存在可替换材料不能指定材料的问题
luomolhx Jan 28, 2025
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
5 changes: 0 additions & 5 deletions src/main/java/com/silvermoon/boxplusplus/boxplusplus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ public void serverStarting(FMLServerStartingEvent event) {
proxy.serverStarting(event);
}

@Mod.EventHandler
public void serverStarted(FMLServerStartedEvent event) {
proxy.serverStarted(event);
}

public static final CreativeTabs BoxTab = new CreativeTabs("BoxPlusPlus") {

@Override
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@ public void init(FMLInitializationEvent event) {
// postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed)
public void postInit(FMLPostInitializationEvent event) {}

public static boolean isRecipeLoaded;

// register server commands in this event handler (Remove if not needed)
public void serverStarting(FMLServerStartingEvent event) {
new RecipeLoader().run();
if (!isRecipeLoaded) {
new RecipeLoader().run();
isRecipeLoaded = true;
}
}

public void serverStarted(FMLServerStartedEvent event) {}
}
95 changes: 74 additions & 21 deletions src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.silvermoon.boxplusplus.util;

import static com.silvermoon.boxplusplus.boxplusplus.LOG;
import static com.silvermoon.boxplusplus.util.Util.*;
import static gregtech.common.blocks.ItemMachines.getMetaTileEntity;

Expand All @@ -19,8 +20,9 @@
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import org.jetbrains.annotations.NotNull;

import com.silvermoon.boxplusplus.api.IBoxable;
import com.silvermoon.boxplusplus.boxplusplus;
import com.silvermoon.boxplusplus.common.tileentities.GTMachineBox;
import com.silvermoon.boxplusplus.network.MessageRouting;
import com.silvermoon.boxplusplus.network.NetworkLoader;
Expand Down Expand Up @@ -55,6 +57,8 @@ public class BoxRoutings {
public int time;
public Long voltage;

public BoxRoutings() {}

public BoxRoutings(GTRecipe recipe, ItemStack machine) {
InputItem.addAll(Arrays.asList(recipe.mInputs));
InputItem.removeAll(Collections.singleton(null));
Expand Down Expand Up @@ -191,6 +195,11 @@ public NBTTagCompound routingToNbt() {
routing.setTag("OutputItem" + (i + 1), writeBoxItemToNBT(OutputItem.get(i), new NBTTagCompound()));
routing.setInteger("OutputChance" + (i + 1), OutputChance.get(i));
}
return getNbtTagCompound(routing);
}

@NotNull
private NBTTagCompound getNbtTagCompound(NBTTagCompound routing) {
for (int i = 0; i < InputFluid.size(); i++) routing.setTag(
"InputFluid" + (i + 1),
InputFluid.get(i)
Expand All @@ -215,19 +224,7 @@ public NBTTagCompound routingToUNbt() {
routing.setTag("OutputItem" + (i + 1), writeBoxItemToUNBT(OutputItem.get(i), new NBTTagCompound()));
routing.setInteger("OutputChance" + (i + 1), OutputChance.get(i));
}
for (int i = 0; i < InputFluid.size(); i++) routing.setTag(
"InputFluid" + (i + 1),
InputFluid.get(i)
.writeToNBT(new NBTTagCompound()));
for (int i = 0; i < OutputFluid.size(); i++) routing.setTag(
"OutputFluid" + (i + 1),
OutputFluid.get(i)
.writeToNBT(new NBTTagCompound()));
routing.setLong("Voltage", voltage);
routing.setInteger("Parallel", Parallel);
routing.setInteger("Time", time);
routing.setInteger("Sp", special);
return routing;
return getNbtTagCompound(routing);
}

public int calHeight() {
Expand Down Expand Up @@ -361,7 +358,7 @@ public static void checkRouting(GTMachineBox box) {
}
}
if (getMetaTileEntity(inputBus.getStackInSlot(i)) instanceof MTEMultiBlockBase RoutingMachine) {
boxplusplus.LOG.debug(RoutingMachine.mName);
LOG.debug(RoutingMachine.mName);
List<ItemStack> ItemInputs = deepCopyItemList(box.getStoredInputs());
List<FluidStack> FluidInputs = deepCopyFluidList(box.getStoredFluids());
switch (RoutingMachine.mName) {
Expand Down Expand Up @@ -680,6 +677,18 @@ public static void checkRouting(GTMachineBox box) {
box.routingStatus = 2;
}

public static List<ItemStack> convertToItemStackList(List<PositionedStack> positionedStacks) {
List<ItemStack> itemStacks = new ArrayList<>();
if (positionedStacks != null) {
for (PositionedStack positionedStack : positionedStacks) {
if (positionedStack != null) {
itemStacks.add(positionedStack.item); // PositionedStack 继承自 ItemStack，直接访问 item 属性
}
}
}
return itemStacks;
}

public static void makeRouting(GTNEIDefaultHandler recipe, int recipeIndex, EntityPlayer player) {
List<PositionedStack> machineListWithPos = RecipeCatalysts.getRecipeCatalysts(recipe);
List<ItemStack> machineList = machineListWithPos.stream()
Expand All @@ -688,12 +697,56 @@ public static void makeRouting(GTNEIDefaultHandler recipe, int recipeIndex, Enti
for (ItemStack machine : machineList) {
if (getMetaTileEntity(machine) instanceof MTEMultiBlockBase mte && !mte.mName.startsWith("TST")
&& !mte.mName.startsWith("name")) {
NetworkLoader.instance.sendToServer(
new MessageRouting(
new BoxRoutings(
((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes.get(recipeIndex)).mRecipe,
machine).routingToNbt(),
player));

List<PositionedStack> mInputs = ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mInputs;
List<ItemStack> itemStackList1 = convertToItemStackList(mInputs);

itemStackList1.removeAll(Collections.singletonList(null));
List<PositionedStack> mOutputs = ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mOutputs;
List<ItemStack> itemStackList2 = convertToItemStackList(mOutputs);
List<FluidStack> fluidStacks = new ArrayList<>(
Arrays.asList(
((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mRecipe.mFluidInputs));
List<FluidStack> fluidStacks2 = new ArrayList<>(
Arrays.asList(
((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mRecipe.mFluidOutputs));

BoxRoutings boxRoutings = new BoxRoutings();
boxRoutings.InputItem = itemStackList1;
boxRoutings.OutputItem = itemStackList2;
if (machine.getUnlocalizedName()
.contains("multimachine.plasmaforge")) {
for (int i = 0; i < boxRoutings.OutputItem.size(); i++) boxRoutings.OutputChance.add(7500);
} else for (int i = 0; i < boxRoutings.OutputItem.size(); i++) boxRoutings.OutputChance.add(
((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes.get(recipeIndex)).mRecipe
.getOutputChance(i));
boxRoutings.OutputItem.removeAll(Collections.singleton(null));
boxRoutings.InputFluid = fluidStacks;
boxRoutings.OutputFluid = fluidStacks2;
boxRoutings.RoutingMachine = machine;
boxRoutings.voltage = (long) ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mRecipe.mEUt;
boxRoutings.time = ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mRecipe.mDuration;
// do some special service
switch (machine.getUnlocalizedName()
.substring(17)) {
case "multimachine.plasmaforge" -> {
boxRoutings.time *= 4;
boxRoutings.OutputFluid.forEach(f -> f.amount = (int) (f.amount * 0.75));
}
case "multimachine.blastfurnace", "multimachine.adv.blastfurnace", "megablastfurnace" -> boxRoutings.special = ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes
.get(recipeIndex)).mRecipe.mSpecialValue;
case "componentassemblyline" -> boxRoutings.time /= 16;
case "quantumforcetransformer.controller.tier.single" -> boxRoutings.OutputFluid.forEach(
f -> f.amount = f.amount / (boxRoutings.OutputFluid.size() + boxRoutings.OutputItem.size()));
}

NetworkLoader.instance.sendToServer(new MessageRouting(boxRoutings.routingToNbt(), player));
break;
}
}
Expand Down