Skip to content

Commit ac2d745

Browse files
Circulate233Circulate233
committed
整理代码，将所有的目标物品加入转化黑名单以防止预期外的工作情况
1 parent e34b88f commit ac2d745

18 files changed

+241
-252
lines changed

‎src/main/java/com/circulation/only_one_item/OnlyOneItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.io.IOException;
1919

2020
@Mod(modid = OnlyOneItem.MOD_ID, name = Tags.MOD_NAME, version = Tags.VERSION,
21-
dependencies = "required-after:mixinbooter@[8.0,);"
21+
dependencies = "required-after:mixinbooter@[8.0,);"
2222
)
2323
public class OnlyOneItem {
2424
public static final String MOD_ID = Tags.MOD_ID;

‎src/main/java/com/circulation/only_one_item/conversion/FluidConversionTarget.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
@Getter
1313
public final class FluidConversionTarget {
1414

15-
private Set<String> matchFluids;
16-
1715
private final String targetID;
16+
private Set<String> matchFluids;
1817

19-
public FluidConversionTarget(String targetID){
18+
public FluidConversionTarget(String targetID) {
2019
this.targetID = targetID;
2120
}
2221

@@ -25,16 +24,16 @@ public FluidConversionTarget setMatchFluids(Set<String> matchFluids) {
2524
return this;
2625
}
2726

28-
public FluidConversionTarget addMatchFluid(String... stacks){
29-
if (matchFluids == null){
27+
public FluidConversionTarget addMatchFluid(String... stacks) {
28+
if (matchFluids == null) {
3029
matchFluids = new ObjectOpenHashSet<>();
3130
}
3231
matchFluids.addAll(Arrays.asList(stacks));
3332
return this;
3433
}
3534

36-
public FluidConversionTarget addMatchFluid(FluidStack... stacks){
37-
if (matchFluids == null){
35+
public FluidConversionTarget addMatchFluid(FluidStack... stacks) {
36+
if (matchFluids == null) {
3837
matchFluids = new ObjectOpenHashSet<>();
3938
}
4039
for (FluidStack stack : stacks) {

‎src/main/java/com/circulation/only_one_item/conversion/ItemConversionTarget.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111

1212
@Getter
1313
public final class ItemConversionTarget {
14-
private Set<MatchItem> matchItems;
15-
1614
private final String targetID;
1715
private final int targetMeta;
16+
private Set<MatchItem> matchItems;
17+
18+
public ItemConversionTarget(String targetID, int targetMeta) {
19+
this.targetID = targetID;
20+
this.targetMeta = targetMeta;
21+
}
1822

1923
public Item getTarget() {
2024
return Item.getByNameOrId(targetID);
@@ -24,11 +28,6 @@ public ItemStack getItemStack() {
2428
return new ItemStack(getTarget(), 1, targetMeta);
2529
}
2630

27-
public ItemConversionTarget(String targetID, int targetMeta) {
28-
this.targetID = targetID;
29-
this.targetMeta = targetMeta;
30-
}
31-
3231
public ItemConversionTarget addMatchItem(ItemStack... stacks) {
3332
if (matchItems == null) {
3433
matchItems = new ObjectOpenHashSet<>();

‎src/main/java/com/circulation/only_one_item/crt/CrtBlackList.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@ public class CrtBlackList {
1919
public static final Set<BlackMatchItem> list = new ObjectOpenHashSet<>();
2020

2121
@ZenMethod
22-
public static void addMatchItem(IItemStack stack){
22+
public static void addMatchItem(IItemStack stack) {
2323
list.add(BlackMatchItem.getInstance(CraftTweakerMC.getItemStack(stack)));
2424
}
2525

2626
@ZenMethod
27-
public static void addMatchItem(IOreDictEntry oreDictEntry){
27+
public static void addMatchItem(IOreDictEntry oreDictEntry) {
2828
list.add(BlackMatchItem.getInstance(Type.OreDict, oreDictEntry.getName()));
2929
}
3030

3131
@ZenMethod
32-
public static void addMatchItem(String modid){
32+
public static void addMatchItem(String modid) {
3333
list.add(BlackMatchItem.getInstance(Type.ModID, modid));
3434
}
3535

3636
@ZenMethod
37-
public static void addMatchItem(Object... matchs){
37+
public static void addMatchItem(Object... matchs) {
3838
for (Object match : matchs) {
39-
if (match instanceof IOreDictEntry iOreDictEntry){
39+
if (match instanceof IOreDictEntry iOreDictEntry) {
4040
addMatchItem(iOreDictEntry);
4141
} else if (match instanceof IItemStack stack) {
4242
addMatchItem(stack);
43-
} else if (match instanceof String modid){
43+
} else if (match instanceof String modid) {
4444
addMatchItem(modid);
4545
}
4646
}

‎src/main/java/com/circulation/only_one_item/crt/CrtConversionFluidTarget.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,41 @@ public class CrtConversionFluidTarget {
2121
private final Set<String> matchFluids = new ObjectOpenHashSet<>();
2222
private final String targetID;
2323

24-
public CrtConversionFluidTarget(String id){
24+
public CrtConversionFluidTarget(String id) {
2525
this.targetID = id;
2626
}
2727

2828
@ZenMethod
29-
public static CrtConversionFluidTarget create(ILiquidStack target){
29+
public static CrtConversionFluidTarget create(ILiquidStack target) {
3030
return new CrtConversionFluidTarget(target.getName());
3131
}
3232

3333
@ZenMethod
34-
public CrtConversionFluidTarget addMatchFluid(String name){
34+
public CrtConversionFluidTarget addMatchFluid(String name) {
3535
matchFluids.add(name);
3636
return this;
3737
}
3838

3939
@ZenMethod
40-
public CrtConversionFluidTarget addMatchFluid(ILiquidStack stack){
40+
public CrtConversionFluidTarget addMatchFluid(ILiquidStack stack) {
4141
matchFluids.add(stack.getName());
4242
return this;
4343
}
4444

4545
@ZenMethod
46-
public CrtConversionFluidTarget addMatchFluid(Object... objs){
46+
public CrtConversionFluidTarget addMatchFluid(Object... objs) {
4747
for (Object obj : objs) {
48-
if (obj instanceof String name){
48+
if (obj instanceof String name) {
4949
addMatchFluid(name);
50-
} else if (obj instanceof ILiquidStack stack){
50+
} else if (obj instanceof ILiquidStack stack) {
5151
addMatchFluid(stack);
5252
}
5353
}
5454
return this;
5555
}
5656

5757
@ZenMethod
58-
public void register(){
58+
public void register() {
5959
list.add(new FluidConversionTarget(targetID).setMatchFluids(matchFluids));
6060
}
6161
}

‎src/main/java/com/circulation/only_one_item/crt/CrtConversionItemTarget.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,36 @@ public class CrtConversionItemTarget {
2828
private final String targetID;
2929
private final int targetMeta;
3030

31-
public CrtConversionItemTarget(String id, int meta){
31+
public CrtConversionItemTarget(String id, int meta) {
3232
this.targetID = id;
3333
this.targetMeta = meta;
3434
}
3535

3636
@ZenMethod
37-
public static CrtConversionItemTarget create(IItemStack target){
37+
public static CrtConversionItemTarget create(IItemStack target) {
3838
if (target == null) {
3939
var i = SimpleItem.getInstance(ItemStack.EMPTY);
40-
return new CrtConversionItemTarget(i.getItemID(),i.getMeta());
40+
return new CrtConversionItemTarget(i.getItemID(), i.getMeta());
4141
}
4242
return new CrtConversionItemTarget(target.getDefinition().getId(), target.getMetadata());
4343
}
4444

4545
@ZenMethod
46-
public CrtConversionItemTarget addMatchItem(IItemStack stack){
46+
public CrtConversionItemTarget addMatchItem(IItemStack stack) {
4747
matchItems.add(MatchItem.getInstance(CraftTweakerMC.getItemStack(stack)));
4848
return this;
4949
}
5050

5151
@ZenMethod
52-
public CrtConversionItemTarget addMatchItem(IOreDictEntry oreDictEntry){
52+
public CrtConversionItemTarget addMatchItem(IOreDictEntry oreDictEntry) {
5353
matchItems.add(MatchItem.getInstance(oreDictEntry.getName()));
5454
return this;
5555
}
5656

5757
@ZenMethod
58-
public CrtConversionItemTarget addMatchItem(Object... odOrItems){
58+
public CrtConversionItemTarget addMatchItem(Object... odOrItems) {
5959
for (Object odOrItem : odOrItems) {
60-
if (odOrItem instanceof IOreDictEntry iOreDictEntry){
60+
if (odOrItem instanceof IOreDictEntry iOreDictEntry) {
6161
addMatchItem(iOreDictEntry);
6262
} else if (odOrItem instanceof IItemStack stack) {
6363
addMatchItem(stack);
@@ -67,7 +67,7 @@ public CrtConversionItemTarget addMatchItem(Object... odOrItems){
6767
}
6868

6969
@ZenMethod
70-
public void register(){
71-
list.add(new ItemConversionTarget(targetID,targetMeta).setMatchItem(matchItems));
70+
public void register() {
71+
list.add(new ItemConversionTarget(targetID, targetMeta).setMatchItem(matchItems));
7272
}
7373
}

‎src/main/java/com/circulation/only_one_item/handler/InitHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
public class InitHandler {
99

10-
public static void allPreInit(){
10+
public static void allPreInit() {
1111
MatchItemHandler.preItemStackInit();
1212
MatchFluidHandler.preFluidStackInit();
1313

14-
if (Loader.isModLoaded("mekanism"))MekInit();
14+
if (Loader.isModLoaded("mekanism")) MekInit();
1515
}
1616

1717
@Optional.Method(modid = "mekanism")
18-
private static void MekInit(){
18+
private static void MekInit() {
1919
RecipeHandler.Recipe.values().forEach(recipe -> ((OOIMekRecipe) recipe).ooi$refresh());
2020
}
2121
}

‎src/main/java/com/circulation/only_one_item/handler/MatchFluidHandler.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,43 @@
1515

1616
public class MatchFluidHandler {
1717

18-
private static List<WeakReference<OOIFluidStack>> list = new ObjectArrayList<>();
19-
2018
private static final Map<String, Fluid> fluidNameToTargetMap = new Object2ReferenceOpenHashMap<>();
19+
private static List<WeakReference<OOIFluidStack>> list = new ObjectArrayList<>();
2120

2221
public static void preFluidStackInit() {
2322
if (list == null)
2423
throw new RuntimeException("[OOI] Initialization should not be performed multiple times");
25-
((OOIFluidStack) new FluidStack(FluidRegistry.WATER,1)).ooi$init();
24+
((OOIFluidStack) new FluidStack(FluidRegistry.WATER, 1)).ooi$init();
2625
list.parallelStream()
27-
.forEach(ref -> {
28-
var fluid = ref.get();
29-
if (fluid != null) {
30-
IRegistryDelegate<Fluid> stack;
31-
if ((stack = fluid.ooi$getFluidDelegate()) != null){
32-
fluid.ooi$ooiInit(stack.get());
33-
}
26+
.forEach(ref -> {
27+
var fluid = ref.get();
28+
if (fluid != null) {
29+
IRegistryDelegate<Fluid> stack;
30+
if ((stack = fluid.ooi$getFluidDelegate()) != null) {
31+
fluid.ooi$ooiInit(stack.get());
3432
}
35-
});
33+
}
34+
});
3635
list.clear();
3736
list = null;
3837
}
3938

40-
public static synchronized void addPreFluidStack(OOIFluidStack i){
39+
public static synchronized void addPreFluidStack(OOIFluidStack i) {
4140
if (list == null)
4241
throw new RuntimeException("[OOI] It should not be added again after initialization");
4342
list.add(new WeakReference<>(i));
4443
}
4544

4645
public static Fluid match(Object obj) {
47-
if (!(obj instanceof Fluid fluid))return null;
46+
if (!(obj instanceof Fluid fluid)) return null;
4847
return fluidNameToTargetMap.get(fluid.getName());
4948
}
5049

5150
public static void Init(List<FluidConversionTarget> fluids) {
5251
for (FluidConversionTarget t : fluids) {
5352
for (String fluid : t.getMatchFluids()) {
54-
if (t.getTarget() != null){
55-
fluidNameToTargetMap.put(fluid,t.getTarget());
53+
if (t.getTarget() != null) {
54+
fluidNameToTargetMap.put(fluid, t.getTarget());
5655
}
5756
}
5857
}

0 commit comments

Comments
 (0)