Skip to content

Commit 84056b1

Browse files
Circulate233Circulate233
committed
部分调整
1 parent f45f8ae commit 84056b1

File tree

11 files changed

+37
-46
lines changed

11 files changed

+37
-46
lines changed

‎src/main/java/github/kasuminova/novaeng/client/gui/GuiHyperNetTerminal.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
3131
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
3232
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
33-
import lombok.experimental.ExtensionMethod;
3433
import net.minecraft.client.Minecraft;
3534
import net.minecraft.client.entity.EntityPlayerSP;
3635
import net.minecraft.client.gui.FontRenderer;
@@ -58,7 +57,6 @@
5857
import java.util.Set;
5958
import java.util.stream.Collectors;
6059

61-
@ExtensionMethod(StringUtils.class)
6260
public class GuiHyperNetTerminal extends GuiContainerBase<ContainerHyperNetTerminal> {
6361
protected static final Comparator<ResearchCognitionData> comparator =
6462
(o1, o2) -> {
@@ -542,7 +540,7 @@ protected void updateRenderingData() {
542540

543541
String searchFilter = searchTextField.getText();
544542
if (!searchFilter.isEmpty()) {
545-
List<String> filtered = searchFilter.sortWithMatchRate(tmp.keySet());
543+
List<String> filtered = StringUtils.sortWithMatchRate(searchFilter, tmp.keySet());
546544
if (filtered.isEmpty()) {
547545
searchTextField.setTextColor(0xFF0000);
548546
} else {

‎src/main/java/github/kasuminova/novaeng/common/CommonProxy.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ import github.kasuminova.novaeng.common.integration.ic2.IntegrationIC2
3838
import github.kasuminova.novaeng.common.integration.theoneprobe.IntegrationTOP
3939
import github.kasuminova.novaeng.common.machine.BiogenicSimulationComputer
4040
import github.kasuminova.novaeng.common.machine.DreamEnergyCore
41-
import github.kasuminova.novaeng.common.machine.Drills.DifferentWorld
42-
import github.kasuminova.novaeng.common.machine.Drills.ManaOreDrill
43-
import github.kasuminova.novaeng.common.machine.Drills.MineralExtractor
44-
import github.kasuminova.novaeng.common.machine.Drills.OrichalcosDrill
45-
import github.kasuminova.novaeng.common.machine.Drills.SmallOreDrill
46-
import github.kasuminova.novaeng.common.machine.Drills.VoidMiner
4741
import github.kasuminova.novaeng.common.machine.GeocentricDrill
4842
import github.kasuminova.novaeng.common.machine.IllumPool
4943
import github.kasuminova.novaeng.common.machine.MMAltar
5044
import github.kasuminova.novaeng.common.machine.MaterialSequenceProcessing
5145
import github.kasuminova.novaeng.common.machine.SingularityCore
5246
import github.kasuminova.novaeng.common.machine.SpaceGenerator
47+
import github.kasuminova.novaeng.common.machine.drills.DifferentWorld
48+
import github.kasuminova.novaeng.common.machine.drills.ManaOreDrill
49+
import github.kasuminova.novaeng.common.machine.drills.MineralExtractor
50+
import github.kasuminova.novaeng.common.machine.drills.OrichalcosDrill
51+
import github.kasuminova.novaeng.common.machine.drills.SmallOreDrill
52+
import github.kasuminova.novaeng.common.machine.drills.VoidMiner
5353
import github.kasuminova.novaeng.common.registry.RegistryAssembly
5454
import github.kasuminova.novaeng.common.registry.RegistryBlocks
5555
import github.kasuminova.novaeng.common.registry.RegistryHyperNet

‎src/main/java/github/kasuminova/novaeng/common/item/ItemRawOre.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
88
import it.unimi.dsi.fastutil.objects.ReferenceCollection;
99
import lombok.Getter;
10-
import lombok.experimental.ExtensionMethod;
1110
import net.minecraft.block.Block;
1211
import net.minecraft.block.SoundType;
1312
import net.minecraft.block.material.Material;
@@ -21,7 +20,6 @@
2120

2221
import static github.kasuminova.novaeng.common.registry.RegistryItems.ITEMS_TO_REGISTER;
2322

24-
@ExtensionMethod(StringUtils.class)
2523
public final class ItemRawOre extends Item {
2624

2725
private static final Object2ReferenceMap<String, ItemRawOre> allItemRawOre = new Object2ReferenceOpenHashMap<>();
@@ -52,7 +50,7 @@ public ItemStack createIcon() {
5250

5351
public ItemRawOre(String name, Type type) {
5452
if (type == Type.BLOCK) throw new RuntimeException("Directly registering BlockRawOre is not allowed");
55-
this.name = name.camelToSnake();
53+
this.name = StringUtils.camelToSnake(name);
5654
this.type = type;
5755
this.setCreativeTab(rawOreTab);
5856
var key = type.getName() + "_" + this.name;
@@ -205,7 +203,7 @@ public enum Type {
205203

206204
Type(@NotNull String name) {
207205
this.odName = name;
208-
this.name = name.camelToSnake();
206+
this.name = StringUtils.camelToSnake(name);
209207
this.localizationKey = "novaeng.part." + this.name;
210208
this.defR = this.name().equals("BLOCK") ?
211209
"blocks/raw_block/raw_block" : "items/raw_ore/" + this.name;

‎src/main/java/github/kasuminova/novaeng/common/machine/MaterialSequenceProcessing.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22

33
import crafttweaker.CraftTweakerAPI;
44
import crafttweaker.api.minecraft.CraftTweakerMC;
5-
import github.kasuminova.novaeng.common.crafttweaker.expansion.RecipePrimerHyperNet;
65
import hellfirepvp.modularmachinery.ModularMachinery;
76
import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeBuilder;
87
import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeModifierBuilder;
98
import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
109
import hellfirepvp.modularmachinery.common.modifier.RecipeModifier;
11-
import lombok.experimental.ExtensionMethod;
1210
import mustapelto.deepmoblearning.common.metadata.MetadataDataModel;
1311
import mustapelto.deepmoblearning.common.metadata.MetadataManager;
1412
import net.minecraft.util.ResourceLocation;
1513

14+
import static github.kasuminova.novaeng.common.crafttweaker.expansion.RecipePrimerHyperNet.requireResearch;
15+
1616
//TODO:处理硬编码
17-
@ExtensionMethod(RecipePrimerHyperNet.class)
1817
public class MaterialSequenceProcessing implements MachineSpecial {
1918
public static final MaterialSequenceProcessing INSTANCE = new MaterialSequenceProcessing();
2019
private static final String MachineID = "material_sequence_processing";
@@ -38,16 +37,16 @@ public void preInit(final DynamicMachine machine) {
3837
tag.append("right").append(i - 2);
3938
tagname.append("在右").append(i - 2).append("仓室执行此配方");
4039
} else break;
41-
RecipeBuilder.newBuilder(MachineID + item.getItem().getRegistryName() + i, MachineID, 20, 1)
42-
.addEnergyPerTickInput(204800)
43-
.addInputs(CraftTweakerMC.getIItemStack(item)).setTag(tag.toString())
44-
.addCatalystInput(
45-
CraftTweakerAPI.itemUtils.getItem("contenttweaker:hxs", 0),
46-
new String[]{"输入核心素催化物质重组,产物增加25%,每并行需要一个", "并不能增加单次产出低于4的产物数量.."},
47-
new RecipeModifier[]{RecipeModifierBuilder.create("modularmachinery:item", "output", 1.25f, 1, false).build()}
48-
).setChance(0.01f)
49-
.addOutputs(CraftTweakerMC.getIItemStack(item0))
50-
.requireResearch("pristine")
40+
requireResearch(RecipeBuilder.newBuilder(MachineID + item.getItem().getRegistryName() + i, MachineID, 20, 1)
41+
.addEnergyPerTickInput(204800)
42+
.addInputs(CraftTweakerMC.getIItemStack(item)).setTag(tag.toString())
43+
.addCatalystInput(
44+
CraftTweakerAPI.itemUtils.getItem("contenttweaker:hxs", 0),
45+
new String[]{"输入核心素催化物质重组,产物增加25%,每并行需要一个", "并不能增加单次产出低于4的产物数量.."},
46+
new RecipeModifier[]{RecipeModifierBuilder.create("modularmachinery:item", "output", 1.25f, 1, false).build()}
47+
).setChance(0.01f)
48+
.addOutputs(CraftTweakerMC.getIItemStack(item0))
49+
, "pristine")
5150
.addRecipeTooltip(tagname.toString(), "核心素可以在任意仓内")
5251
.build();
5352
}

src/main/java/github/kasuminova/novaeng/common/machine/Drills/DifferentWorld.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/DifferentWorld.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
public class DifferentWorld extends Drill {
44
public static final DifferentWorld INSTANCE = new DifferentWorld();

src/main/java/github/kasuminova/novaeng/common/machine/Drills/Drill.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/Drill.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
import blusunrize.immersiveengineering.api.tool.ExcavatorHandler;
44
import blusunrize.immersiveengineering.common.Config;
@@ -10,7 +10,6 @@
1010
import github.kasuminova.mmce.common.event.machine.MachineStructureFormedEvent;
1111
import github.kasuminova.mmce.common.event.machine.MachineStructureUpdateEvent;
1212
import github.kasuminova.novaeng.NovaEngineeringCore;
13-
import github.kasuminova.novaeng.common.crafttweaker.expansion.RecipePrimerHyperNet;
1413
import github.kasuminova.novaeng.common.crafttweaker.hypernet.HyperNetHelper;
1514
import github.kasuminova.novaeng.common.handler.OreHandler;
1615
import github.kasuminova.novaeng.common.machine.MachineSpecial;
@@ -25,7 +24,6 @@
2524
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
2625
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
2726
import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
28-
import lombok.experimental.ExtensionMethod;
2927
import lombok.val;
3028
import mcjty.theoneprobe.api.IProbeHitData;
3129
import mcjty.theoneprobe.api.IProbeInfo;
@@ -51,7 +49,6 @@
5149
import static github.kasuminova.novaeng.common.crafttweaker.expansion.RecipePrimerHyperNet.requireResearch;
5250
import static net.minecraft.util.text.translation.I18n.translateToLocalFormatted;
5351

54-
@ExtensionMethod(RecipePrimerHyperNet.class)
5552
public abstract class Drill implements MachineSpecial {
5653
protected static final int[] tqsz = {-1, 0, 1};
5754
protected static final Object2IntMap<String> tqdzb = new Object2IntOpenHashMap<>();
@@ -805,7 +802,8 @@ private void regUpgrade(final DynamicMachine machine) {
805802
upThread.addRecipe("research_mineral_utilization_" + name + "_" + fi);
806803
upThread.addRecipe("additional_component_loading_" + name + "_" + fi);
807804

808-
RecipeBuilder.newBuilder("research_mineral_utilization_" + name + "_" + fi, name, 10)
805+
806+
requireResearch(RecipeBuilder.newBuilder("research_mineral_utilization_" + name + "_" + fi, name, 10)
809807
.addPreCheckHandler(event -> {
810808
var ctrl = event.getController();
811809
var data = ctrl.getCustomDataTag();
@@ -824,12 +822,13 @@ private void regUpgrade(final DynamicMachine machine) {
824822
ctrl.addPermanentModifier("research" + fi, RecipeModifierBuilder.create("modularmachinery:energy", "input", (float) (1 + (0.2 * (fi + 1))), 1, false).build());
825823
data.setBoolean("research_mineral_" + fi, true);
826824
data.setByte("research_progress", (byte) (research_progress + 1));
827-
}).requireResearch("research_mineral_utilization_" + fi)
825+
}), "research_mineral_utilization_" + fi)
828826
.setParallelized(false)
829827
.setThreadName(upThreadName)
830828
.setLoadJEI(false)
831829
.build();
832-
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_" + fi, name, 100, 1)
830+
831+
requireResearch(RecipeBuilder.newBuilder("additional_component_loading_" + name + "_" + fi, name, 100, 1)
833832
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_" + fi, 0))
834833
.addPreCheckHandler(event -> {
835834
var ctrl = event.getController();
@@ -851,16 +850,14 @@ private void regUpgrade(final DynamicMachine machine) {
851850

852851
data.setBoolean("additional_component_" + fi, true);
853852
data.setByte("additional_component_" + fi, (byte) (components_amount + 1));
854-
})
855-
.requireResearch("additional_component_loading_" + fi)
853+
}), "additional_component_loading_" + fi)
856854
.setThreadName(upThreadName)
857855
.setParallelized(false)
858856
.setLoadJEI(false)
859857
.build();
860858
}
861859
upThread.addRecipe("additional_component_loading_" + name + "_3");
862-
requireResearch(
863-
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_3", name, 100, 1)
860+
requireResearch(RecipeBuilder.newBuilder("additional_component_loading_" + name + "_3", name, 100, 1)
864861
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_3", 0))
865862
.addPreCheckHandler(event -> {
866863
var ctrl = event.getController();
@@ -890,7 +887,7 @@ private void regUpgrade(final DynamicMachine machine) {
890887
.build();
891888
upThread.addRecipe("additional_component_loading_" + name + "_raw_ore");
892889

893-
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_raw_ore", name, 100, 1)
890+
requireResearch(RecipeBuilder.newBuilder("additional_component_loading_" + name + "_raw_ore", name, 100, 1)
894891
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_raw_ore", 0))
895892
.addPreCheckHandler(event -> {
896893
var ctrl = event.getController();
@@ -908,8 +905,7 @@ private void regUpgrade(final DynamicMachine machine) {
908905
data.setBoolean("additional_component_raw_ore", true);
909906
ctrl.addPermanentModifier("additional_raw_ore", RecipeModifierBuilder.create("modularmachinery:energy", "input", 2, 1, false).build());
910907
ctrl.setCustomDataTag(data);
911-
})
912-
.requireResearch("additional_component_loading_raw_ore")
908+
}), "additional_component_loading_raw_ore")
913909
.setThreadName(upThreadName)
914910
.setParallelized(false)
915911
.setLoadJEI(false)

src/main/java/github/kasuminova/novaeng/common/machine/Drills/ManaOreDrill.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/ManaOreDrill.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
public class ManaOreDrill extends Drill {
44
public static final ManaOreDrill INSTANCE = new ManaOreDrill();

src/main/java/github/kasuminova/novaeng/common/machine/Drills/MineralExtractor.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/MineralExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
public class MineralExtractor extends Drill {
44
public static final MineralExtractor INSTANCE = new MineralExtractor();

src/main/java/github/kasuminova/novaeng/common/machine/Drills/OrichalcosDrill.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/OrichalcosDrill.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
public class OrichalcosDrill extends Drill {
44
public static final OrichalcosDrill INSTANCE = new OrichalcosDrill();

src/main/java/github/kasuminova/novaeng/common/machine/Drills/SmallOreDrill.java renamed to src/main/java/github/kasuminova/novaeng/common/machine/drills/SmallOreDrill.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package github.kasuminova.novaeng.common.machine.Drills;
1+
package github.kasuminova.novaeng.common.machine.drills;
22

33
public class SmallOreDrill extends Drill {
44
public static final SmallOreDrill INSTANCE = new SmallOreDrill();

0 commit comments

Comments
 (0)