Skip to content

Commit df28a13

Browse files
Circulate233Circulate233
committed
整理
1 parent 42bef5d commit df28a13

23 files changed

+99
-100
lines changed

‎src/main/java/com/circulation/random_complement/RandomComplement.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import org.apache.logging.log4j.Logger;
1313

1414
@Mod(modid = "random_complement", name = Tags.MOD_NAME, version = Tags.VERSION,
15-
dependencies = "required-after:mixinbooter@[8.0,);" +
16-
"after:appliedenergistics2@[v0.56.7,);" +
17-
"after:jei@[4.29.8,);" +
18-
"after:thaumicenergistics@[2.3.5,);" +
19-
"after:botania;" +
20-
"before:shulkertooltip@[1.9.2,);"
15+
dependencies = "required-after:mixinbooter@[8.0,);" +
16+
"after:appliedenergistics2@[v0.56.7,);" +
17+
"after:jei@[4.29.8,);" +
18+
"after:thaumicenergistics@[2.3.5,);" +
19+
"after:botania;" +
20+
"before:shulkertooltip@[1.9.2,);"
2121
)
2222
public class RandomComplement {
2323

‎src/main/java/com/circulation/random_complement/client/ClientProxy.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
public class ClientProxy extends CommonProxy {
2525
public static final String categoryJEI = "RandomComplement(JEI)";
2626

27+
public static ItemStack getMouseItem() {
28+
var i = Minecraft.getMinecraft().player.inventory.getItemStack();
29+
if (!i.isEmpty()) return i;
30+
31+
if (Loader.isModLoaded("jei")) return getJEIMouseItem();
32+
33+
return ItemStack.EMPTY;
34+
}
35+
36+
@Optional.Method(modid = "jei")
37+
public static ItemStack getJEIMouseItem() {
38+
var ii = ((AccessorGhostIngredientDragManager) ((AccessorInputHandler) Internal.getInputHandler()).getGhostIngredientDragManager()).getGhostIngredientDrag();
39+
if (ii != null && ii.getIngredient() instanceof ItemStack stack) return stack;
40+
return ItemStack.EMPTY;
41+
}
42+
2743
@Override
2844
public void construction() {
2945
super.construction();
@@ -78,22 +94,6 @@ public void onRegisterModels(ModelRegistryEvent event) {
7894

7995
}
8096

81-
public static ItemStack getMouseItem() {
82-
var i = Minecraft.getMinecraft().player.inventory.getItemStack();
83-
if (!i.isEmpty()) return i;
84-
85-
if (Loader.isModLoaded("jei")) return getJEIMouseItem();
86-
87-
return ItemStack.EMPTY;
88-
}
89-
90-
@Optional.Method(modid = "jei")
91-
public static ItemStack getJEIMouseItem() {
92-
var ii = ((AccessorGhostIngredientDragManager) ((AccessorInputHandler) Internal.getInputHandler()).getGhostIngredientDragManager()).getGhostIngredientDrag();
93-
if (ii != null && ii.getIngredient() instanceof ItemStack stack) return stack;
94-
return ItemStack.EMPTY;
95-
}
96-
9797
@Override
9898
@Optional.Method(modid = "jei")
9999
public boolean isMouseHasItem() {

‎src/main/java/com/circulation/random_complement/client/handler/ItemTooltipHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ItemTooltipHandler {
2222
public static void regItemTooltip(Class<? extends GuiScreen> aClass, ItemTooltipAdd tooltip) {
2323
synchronized (map) {
2424
map.computeIfAbsent(aClass, c -> new ObjectArrayList<>())
25-
.add(tooltip);
25+
.add(tooltip);
2626
}
2727
}
2828

‎src/main/java/com/circulation/random_complement/common/handler/CraftingUnitHandler.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static void addMatch(ItemStack item, Block block, BlockCraftingUnit craft
4848

4949
public static boolean isReplaceable(ItemStack item, Block block) {
5050
return (CraftingUnitBaseSet.contains(block) || CraftingUnitBlockMap.containsKey(block))
51-
&& (item == null || CraftingUnitItemMap.containsKey(SimpleItem.getInstance(item)));
51+
&& (item == null || CraftingUnitItemMap.containsKey(SimpleItem.getInstance(item)));
5252
}
5353

5454
public static BlockCraftingUnit getCraftingUnitBase(Block block) {
@@ -76,15 +76,15 @@ private static void registerAE() {
7676
var materials = def.materials();
7777
var blocks = def.blocks();
7878
blocks.craftingStorage1k().maybeBlock()
79-
.ifPresent(b -> addMatch(materials.cell1kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
79+
.ifPresent(b -> addMatch(materials.cell1kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
8080
blocks.craftingStorage4k().maybeBlock()
81-
.ifPresent(b -> addMatch(materials.cell4kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
81+
.ifPresent(b -> addMatch(materials.cell4kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
8282
blocks.craftingStorage16k().maybeBlock()
83-
.ifPresent(b -> addMatch(materials.cell16kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
83+
.ifPresent(b -> addMatch(materials.cell16kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
8484
blocks.craftingStorage64k().maybeBlock()
85-
.ifPresent(b -> addMatch(materials.cell64kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
85+
.ifPresent(b -> addMatch(materials.cell64kPart().maybeStack(1).orElse(ItemStack.EMPTY), b));
8686
blocks.craftingAccelerator().maybeBlock()
87-
.ifPresent(b -> addMatch(materials.engProcessor().maybeStack(1).orElse(ItemStack.EMPTY), b));
87+
.ifPresent(b -> addMatch(materials.engProcessor().maybeStack(1).orElse(ItemStack.EMPTY), b));
8888
}
8989

9090
@Optional.Method(modid = "nae2")
@@ -93,13 +93,13 @@ private static void registerNAE2() {
9393
var materials = def.materials();
9494
var blocks = def.blocks();
9595
blocks.storageCrafting256K().maybeBlock()
96-
.ifPresent(b -> addMatch(materials.cellPart256K().maybeStack(1).orElse(ItemStack.EMPTY), b));
96+
.ifPresent(b -> addMatch(materials.cellPart256K().maybeStack(1).orElse(ItemStack.EMPTY), b));
9797
blocks.storageCrafting1024K().maybeBlock()
98-
.ifPresent(b -> addMatch(materials.cellPart1024K().maybeStack(1).orElse(ItemStack.EMPTY), b));
98+
.ifPresent(b -> addMatch(materials.cellPart1024K().maybeStack(1).orElse(ItemStack.EMPTY), b));
9999
blocks.storageCrafting4096K().maybeBlock()
100-
.ifPresent(b -> addMatch(materials.cellPart4096K().maybeStack(1).orElse(ItemStack.EMPTY), b));
100+
.ifPresent(b -> addMatch(materials.cellPart4096K().maybeStack(1).orElse(ItemStack.EMPTY), b));
101101
blocks.storageCrafting16384K().maybeBlock()
102-
.ifPresent(b -> addMatch(materials.cellPart16384K().maybeStack(1).orElse(ItemStack.EMPTY), b));
102+
.ifPresent(b -> addMatch(materials.cellPart16384K().maybeStack(1).orElse(ItemStack.EMPTY), b));
103103
}
104104

105105
/*
@@ -117,11 +117,11 @@ private static void registerEXCPU() {
117117
final var block16384k = Block.getBlockFromName("extracpus:crafting_storage_16384k");
118118
if (item != null) {
119119
ModBlocks.CRAFTING_STORAGE_256K.maybeBlock()
120-
.ifPresent(b -> addMatch(new ItemStack(item, 1, 0), b));
120+
.ifPresent(b -> addMatch(new ItemStack(item, 1, 0), b));
121121
ModBlocks.CRAFTING_STORAGE_1024K.maybeBlock()
122-
.ifPresent(b -> addMatch(new ItemStack(item, 1, 1), b));
122+
.ifPresent(b -> addMatch(new ItemStack(item, 1, 1), b));
123123
ModBlocks.CRAFTING_STORAGE_4096K.maybeBlock()
124-
.ifPresent(b -> addMatch(new ItemStack(item, 1, 2), b));
124+
.ifPresent(b -> addMatch(new ItemStack(item, 1, 2), b));
125125
addMatch(new ItemStack(item, 1, 3), block16384k);
126126
}
127127
}

‎src/main/java/com/circulation/random_complement/common/network/KeyBindingHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public IMessage onMessage(KeyBindingHandler message, MessageContext ctx) {
8686
switch (message.key) {
8787
case "RetrieveItem" -> retrieveItem(player, container, item, message.isAE);
8888
case "StartCraft" ->
89-
player.getServer().addScheduledTask(() -> startCraft(player, container, item, message.isAE));
89+
player.getServer().addScheduledTask(() -> startCraft(player, container, item, message.isAE));
9090
}
9191
return null;
9292
}
@@ -159,7 +159,7 @@ private void startCraft(EntityPlayerMP player, Container container, ItemStack it
159159
item.setCount(1);
160160
if (!isAE) {
161161
if (player.openContainer instanceof ContainerCraftAmount
162-
|| player.openContainer instanceof ContainerCraftConfirm) return;
162+
|| player.openContainer instanceof ContainerCraftConfirm) return;
163163
for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
164164
ItemStack ii = player.inventory.getStackInSlot(i);
165165
WirelessTerminalGuiObject obj = MEHandler.getTerminalGuiObject(ii, player, i, 0);
@@ -248,9 +248,9 @@ private void openWirelessCraft(ItemStack terminal, EntityPlayerMP player, ItemSt
248248
@Method(modid = "ae2fc")
249249
private void ae2fcCraft(IActionHost host, EntityPlayerMP player, ContainerMEMonitorable c) {
250250
if (host instanceof PartExtendedFluidPatternTerminal
251-
|| host instanceof PartFluidPatternTerminal
252-
|| (host instanceof WirelessTerminalGuiObject w &&
253-
(w.getItemStack().getItem() instanceof ItemWirelessFluidPatternTerminal || (w.getItemStack().hasTagCompound() && w.getItemStack().getTagCompound().getByte("mode") == 4)))) {
251+
|| host instanceof PartFluidPatternTerminal
252+
|| (host instanceof WirelessTerminalGuiObject w &&
253+
(w.getItemStack().getItem() instanceof ItemWirelessFluidPatternTerminal || (w.getItemStack().hasTagCompound() && w.getItemStack().getTagCompound().getByte("mode") == 4)))) {
254254
var context = c.getOpenContext();
255255
player.getServerWorld().addScheduledTask(() -> InventoryHandler.openGui(player, Ae2Reflect.getContextWorld(context), new BlockPos(Ae2Reflect.getContextX(context), Ae2Reflect.getContextY(context), Ae2Reflect.getContextZ(context)), context.getSide().getFacing(), GuiType.FLUID_CRAFT_AMOUNT));
256256
return;

‎src/main/java/com/circulation/random_complement/common/network/RCActionButton.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public IMessage onMessage(RCActionButton message, MessageContext ctx) {
5858
val pattern = oldPattern.copy();
5959
NBTTagCompound pNbt;
6060
if (!pattern.isEmpty()
61-
&& pattern.getItem() instanceof ItemEncodedPattern ep
62-
&& pattern.hasTagCompound()
63-
&& !(pNbt = pattern.getTagCompound()).getBoolean("crafting")
61+
&& pattern.getItem() instanceof ItemEncodedPattern ep
62+
&& pattern.hasTagCompound()
63+
&& !(pNbt = pattern.getTagCompound()).getBoolean("crafting")
6464
) {
6565
val in = pNbt.getTagList("in", 10);
6666
boolean success = true;

‎src/main/java/com/circulation/random_complement/common/util/MEHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353

5454
public class MEHandler {
5555

56+
public static final boolean loadAE2FC = Loader.isModLoaded("ae2fc");
57+
public static final boolean loadMEKEng = Loader.isModLoaded("mekeng");
5658
@Getter
5759
private static final Set<IAEItemStack> craftableCacheS = new ObjectOpenHashSet<>();
5860
private static final Int2ObjectMap<ResourceLocation> textures = new Int2ObjectOpenHashMap<>();
59-
public static final boolean loadAE2FC = Loader.isModLoaded("ae2fc");
60-
public static final boolean loadMEKEng = Loader.isModLoaded("mekeng");
6161

6262
static {
6363
textures.put(0, new ResourceLocation(RandomComplement.MOD_ID + ":textures/gui/pinned0.png"));
@@ -107,9 +107,9 @@ public static void refillBlankPatterns(ContainerMEMonitorable container, SlotRes
107107
var blankPattern = AEApi.instance().definitions().materials().blankPattern().maybeStack(blanksToRefill);
108108
if (blankPattern.isPresent()) {
109109
final AEItemStack request = AEItemStack
110-
.fromItemStack(blankPattern.get());
110+
.fromItemStack(blankPattern.get());
111111
final IAEItemStack extracted = Platform
112-
.poweredExtraction(container.getPowerSource(), container.getCellInventory(), request, container.getActionSource());
112+
.poweredExtraction(container.getPowerSource(), container.getCellInventory(), request, container.getActionSource());
113113
if (extracted != null) {
114114
if (blanks.isEmpty()) {
115115
blanks = request.getDefinition().copy();

‎src/main/java/com/circulation/random_complement/common/util/SimpleItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public record SimpleItem(@NotNull String str) {
1515
public static final SimpleItem empty = new SimpleItem("e");
1616

1717
private static final LoadingCache<String, SimpleItem> CRAFTABLE_ITEM_POOL =
18-
CacheBuilder.newBuilder()
18+
CacheBuilder.newBuilder()
1919
.maximumSize(10000)
2020
.weakValues()
2121
.build(new CacheLoader<>() {

‎src/main/java/com/circulation/random_complement/common/util/VersionParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static boolean minVersion(String modid, String targetVersion) {
5555

5656
public static boolean rangeVersion(String modid, String min, String max) {
5757
return VersionParser.minVersion(modid, min)
58-
&& VersionParser.maxVersion(modid, max);
58+
&& VersionParser.maxVersion(modid, max);
5959
}
6060

6161
public static String getModVersion(String modid) {

‎src/main/java/com/circulation/random_complement/mixin/ae2/MixinDualityInterface.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public boolean intelligentBlocking(DualityInterface instance, Operation<Boolean>
9898
boolean b = original.call(instance);
9999
if (b) {
100100
return this.randomComplement$rcSettings
101-
.getSetting(RCSettings.IntelligentBlocking) != IntelligentBlocking.OPEN
102-
|| this.r$lastInputHash != patternDetails.hashCode();
101+
.getSetting(RCSettings.IntelligentBlocking) != IntelligentBlocking.OPEN
102+
|| this.r$lastInputHash != patternDetails.hashCode();
103103
}
104104
return b;
105105
}

0 commit comments

Comments
 (0)