Skip to content

Commit 7d919dc

Browse files
Circulate233Circulate233
committed
整理
1 parent 5c40034 commit 7d919dc

File tree

196 files changed

+2970
-2848
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+2970
-2848
lines changed

‎build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ val runtimeOnlyNonPublishable: Configuration by configurations.creating {
127127
listOf(configurations.runtimeClasspath, configurations.testRuntimeClasspath).forEach {
128128
it.configure {
129129
extendsFrom(
130-
runtimeOnlyNonPublishable
130+
runtimeOnlyNonPublishable
131131
)
132132
}
133133
}
@@ -227,7 +227,7 @@ dependencies {
227227
// Mod Dependencies
228228
implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
229229
implementation(rfg.deobf("curse.maven:modularui-624243:7102461"))
230-
implementation(rfg.deobf("curse.maven:electroblobs-wizardry-265642:5354477"))
230+
compileOnly(rfg.deobf("curse.maven:electroblobs-wizardry-265642:5354477"))
231231
implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:6945422"))
232232
implementation(rfg.deobf("kasuminova:MMCE-ComponentModelHider:1.1:dev"))
233233
implementation(rfg.deobf("lumien231:resourceloader:1.5.3:main"))
@@ -259,7 +259,7 @@ dependencies {
259259
implementation(rfg.deobf("curse.maven:eternal-singularity-253077:2922583"))
260260
compileOnly(rfg.deobf("curse.maven:optifine-check-626981:3806565"))
261261
compileOnly(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197"))
262-
compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
262+
implementation(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
263263
// implementation(rfg.deobf("sddsd233:mekceu-9.8.11.185"))
264264
implementation(rfg.deobf("curse.maven:mekanism-ce-unofficial-840735:5946841"))
265265
implementation(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
@@ -268,7 +268,6 @@ dependencies {
268268
implementation(rfg.deobf("curse.maven:astral-sorcery-241721:3044416"))
269269
implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
270270
implementation(rfg.deobf("curse.maven:zenutil-401178:6895021"))
271-
compileOnly(rfg.deobf("curse.maven:smooth-font-285742:3944565"))
272271
implementation(rfg.deobf("curse.maven:scalingguis-319656:2716334"))
273272
implementation(rfg.deobf("curse.maven:lolasm-460609:5257348"))
274273
compileOnly(rfg.deobf("curse.maven:matter-overdrive-community-edition-557428:4592069"))
@@ -321,6 +320,8 @@ dependencies {
321320
implementation(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
322321
implementation(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
323322
implementation(rfg.deobf("curse.maven:packagedastral-811828:7063119"))
323+
implementation(rfg.deobf("curse.maven:Aroma1997Core-223735:2914062"))
324+
implementation(rfg.deobf("curse.maven:tatw-263980:2585616"))
324325
}
325326

326327
// Publishing to a Maven repository

‎src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.LOG_PREFIX;
5050

5151
@Mod(modid = NovaEngineeringCore.MOD_ID, name = NovaEngineeringCore.MOD_NAME, version = NovaEngineeringCore.VERSION,
52-
dependencies = "required-after:forge@[14.23.5.2847,);" +
53-
"required-after:modularmachinery@[2.1.0,);" +
54-
"required:theoneprobe@[1.12-1.4.28,);" +
55-
"required:appliedenergistics2@[v0.56.4,);" +
56-
"required:ae2fc@[2.6.3-r,);" +
57-
"required:configanytime@[2.0,);" +
58-
"required:mixinbooter@[8.0,);" +
59-
"required:lumenized@[1.0.2,);",
60-
acceptedMinecraftVersions = "[1.12, 1.13)",
61-
acceptableRemoteVersions = "[1.21.7, 1.23.0)"
52+
dependencies = "required-after:forge@[14.23.5.2847,);" +
53+
"required-after:modularmachinery@[2.1.0,);" +
54+
"required:theoneprobe@[1.12-1.4.28,);" +
55+
"required:appliedenergistics2@[v0.56.4,);" +
56+
"required:ae2fc@[2.6.3-r,);" +
57+
"required:configanytime@[2.0,);" +
58+
"required:mixinbooter@[8.0,);" +
59+
"required:lumenized@[1.0.2,);",
60+
acceptedMinecraftVersions = "[1.12, 1.13)",
61+
acceptableRemoteVersions = "[1.21.7, 1.23.0)"
6262
)
6363
@SuppressWarnings("MethodMayBeStatic")
6464
public class NovaEngineeringCore {

‎src/main/java/github/kasuminova/novaeng/client/ClientProxy.java‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import github.kasuminova.novaeng.common.tile.ecotech.estorage.EStorageController;
4040
import github.kasuminova.novaeng.common.tile.machine.GeocentricDrillController;
4141
import github.kasuminova.novaeng.common.tile.machine.SingularityCore;
42+
import github.kasuminova.novaeng.mixin.util.NovaBlockColors;
43+
import github.kasuminova.novaeng.mixin.util.NovaItemColors;
4244
import hellfirepvp.modularmachinery.common.base.Mods;
4345
import it.unimi.dsi.fastutil.ints.IntArrayList;
4446
import it.unimi.dsi.fastutil.ints.IntList;
@@ -47,7 +49,6 @@
4749
import it.unimi.dsi.fastutil.objects.ObjectLists;
4850
import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
4951
import lombok.Getter;
50-
import net.minecraft.block.Block;
5152
import net.minecraft.block.state.IBlockState;
5253
import net.minecraft.client.Minecraft;
5354
import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -90,6 +91,8 @@ public class ClientProxy extends CommonProxy {
9091
private static final Object2IntMap<String> colorCache = new Object2IntOpenHashMap<>();
9192
@Getter
9293
private static List<String> itemDisplayTooltip;
94+
private static List<Item> colorsItems = new ReferenceArrayList<>();
95+
private static List<ItemRawOre.BlockRawOre> colorsBlocks = new ReferenceArrayList<>();
9396

9497
static {
9598
colorCache.defaultReturnValue(-1);
@@ -121,12 +124,12 @@ public static Color getColorForItemStack(ItemStack stack) {
121124
if (stack.getItem() instanceof ItemBlock) {
122125
Minecraft mc = Minecraft.getMinecraft();
123126
IBlockState state = ((ItemBlock) stack.getItem()).getBlock().getStateForPlacement(mc.world,
124-
new BlockPos(0, 0, 0), EnumFacing.UP, 0, 0, 0, stack.getMetadata(), mc.player);
127+
new BlockPos(0, 0, 0), EnumFacing.UP, 0, 0, 0, stack.getMetadata(), mc.player);
125128
List<BakedQuad> quads = mc.getBlockRendererDispatcher().getModelForState(state).getQuads(state, EnumFacing.NORTH, 0);
126129
if (quads.isEmpty()) return Color.WHITE;
127130
sprite = quads.get(0).getSprite();
128131
} else sprite = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, null, null)
129-
.getQuads(null, null, 0).get(0).getSprite();
132+
.getQuads(null, null, 0).get(0).getSprite();
130133
IntList colours = new IntArrayList();
131134
for (int[] rows : sprite.getFrameTextureData(0))
132135
for (int colour : rows) if ((colour & 0xFF) > 0) colours.add(colour);
@@ -142,6 +145,14 @@ public static Color getColorForItemStack(ItemStack stack) {
142145
}
143146
}
144147

148+
public static void addColorRawOreItem(Item item) {
149+
if (item != null) colorsItems.add(item);
150+
}
151+
152+
public static void addColorRawOreBlock(ItemRawOre.BlockRawOre block) {
153+
if (block != null) colorsBlocks.add(block);
154+
}
155+
145156
public void setColor(String od, int color) {
146157
colorCache.put(od, color);
147158
}
@@ -183,9 +194,6 @@ public void preInit() {
183194
TitleUtils.setRandomTitle("*PreInit*");
184195
}
185196

186-
public static List<Item> colorsItems = new ReferenceArrayList<>();
187-
public static List<Block> colorsBlocks = new ReferenceArrayList<>();
188-
189197
@Override
190198
public void init() {
191199
super.init();
@@ -202,27 +210,26 @@ public void postInit() {
202210
super.postInit();
203211

204212
Minecraft mc = Minecraft.getMinecraft();
205-
var blockColors = mc.getBlockColors();
206-
var itemColors = mc.getItemColors();
213+
var blockColors = (NovaBlockColors) mc.getBlockColors();
214+
var itemColors = (NovaItemColors) mc.getItemColors();
207215

208-
itemColors.registerItemColorHandler((stack, i) -> {
209-
var item = stack.getItem();
216+
for (var item : colorsItems) {
210217
if (item instanceof ItemRawOre r) {
211-
return getColorForODFirst(r.getPartOD());
218+
final int i = getColorForODFirst(r.getPartOD());
219+
itemColors.n$put(item, (stark, ii) -> i);
220+
continue;
212221
}
213222
if (item instanceof ItemRawOre.BlockRawOre.ItemBLockRawOre r) {
214-
return getColorForODFirst(r.getPartOD());
223+
final int i = getColorForODFirst(r.getPartOD());
224+
itemColors.n$put(item, (stark, ii) -> i);
215225
}
216-
return Color.WHITE.getRGB();
217-
}, colorsItems.toArray(new Item[0]));
226+
}
218227
colorsItems = null;
219228

220-
blockColors.registerBlockColorHandler((state, worldIn, pos, i) -> {
221-
if (state.getBlock() instanceof ItemRawOre.BlockRawOre blockRawOre) {
222-
return getColorForODFirst(blockRawOre.getPartOD());
223-
}
224-
return Color.WHITE.getRGB();
225-
}, colorsBlocks.toArray(new Block[0]));
229+
for (var block : colorsBlocks) {
230+
final int i = getColorForODFirst(block.getPartOD());
231+
blockColors.n$put(block, (state, worldIn, pos, ii) -> i);
232+
}
226233
colorsBlocks = null;
227234

228235
ClientCommandHandler.instance.registerCommand(ExportResearchDataToJson.INSTANCE);
@@ -269,7 +276,7 @@ public Object getClientGuiElement(final int id, final EntityPlayer player, final
269276
return switch (type) {
270277
case HYPERNET_TERMINAL -> new GuiHyperNetTerminal((TileHyperNetTerminal) present, player);
271278
case MODULAR_SERVER_ASSEMBLER ->
272-
new GuiModularServerAssembler((TileModularServerAssembler) present, player);
279+
new GuiModularServerAssembler((TileModularServerAssembler) present, player);
273280
case ESTORAGE_CONTROLLER -> new GuiEStorageController((EStorageController) present, player);
274281
case SINGULARITY_CORE -> new GuiSingularityCore((SingularityCore) present, player);
275282
case EFABRICATOR_CONTROLLER -> new GuiEFabricatorController((EFabricatorController) present, player);
@@ -279,10 +286,10 @@ public Object getClientGuiElement(final int id, final EntityPlayer player, final
279286
case ECALCULATOR_CONTROLLER -> new GuiECalculatorController((ECalculatorController) present, player);
280287
case AUTO_CRAFTGUI -> {
281288
var stack = y == 1 ? BaublesApi.getBaublesHandler(player).getStackInSlot(x)
282-
: player.inventory.getStackInSlot(x);
289+
: player.inventory.getStackInSlot(x);
283290
if (stack.getItem() instanceof IWirelessTermHandler wt) {
284291
yield new GuiNEWCraftConfirm(player.inventory,
285-
new WirelessTerminalGuiObject(wt, stack, player, player.world, x, y, Integer.MIN_VALUE));
292+
new WirelessTerminalGuiObject(wt, stack, player, player.world, x, y, Integer.MIN_VALUE));
286293
} else yield null;
287294
}
288295
case MACHINE_ASSEMBLY_TOOL -> new GuiMachineAssemblyTool(player);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class GuiECalculatorController extends GuiContainerDynamic<ContainerECalc
2222
public static final ResourceLocation ELEMENT_1 = new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/ecalculator_gui_1.png");
2323
public static final ResourceLocation ELEMENT_2 = new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/ecalculator_gui_2.png");
2424
private static final TextureProperties BACKGROUND = new TextureProperties(
25-
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/ecalculator_background.png"),
26-
0, 0, 255, 221
25+
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/ecalculator_background.png"),
26+
0, 0, 255, 221
2727
);
2828

2929
private ECalculatorData data = null;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
public class GuiEFabricatorController extends GuiContainerDynamic<ContainerEFabricatorController> {
2323

2424
public static final ResourceLocation TEXTURES_BACKGROUND_LIGHT = new ResourceLocation(
25-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_light.png");
25+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_light.png");
2626
public static final ResourceLocation TEXTURES_BACKGROUND_DARK = new ResourceLocation(
27-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_dark.png");
27+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_dark.png");
2828
public static final ResourceLocation TEXTURES_INVENTORY = new ResourceLocation(
29-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_inventory.png");
29+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_inventory.png");
3030
public static final ResourceLocation TEXTURES_ELEMENTS = new ResourceLocation(
31-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_elements.png");
31+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_elements.png");
3232

3333
@Getter
3434
private EFabricatorData data = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class GuiEFabricatorPatternBus extends AEBaseGui {
1313

1414
public static final ResourceLocation GUI_TEXTURE =
15-
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_pattern_bus.png");
15+
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_pattern_bus.png");
1616

1717
public GuiEFabricatorPatternBus(final EFabricatorPatternBus owner, final EntityPlayer player) {
1818
super(new ContainerEFabricatorPatternBus(owner, player));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
public class GuiEFabricatorPatternSearch extends GuiContainerDynamic<ContainerEFabricatorPatternSearch> {
2525

2626
public static final ResourceLocation TEXTURES_BACKGROUND_DARK = new ResourceLocation(
27-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_pattern_search_bg_dark.png");
27+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_pattern_search_bg_dark.png");
2828
public static final ResourceLocation TEXTURES_ELEMENTS = new ResourceLocation(
29-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_search.png");
29+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_search.png");
3030
public static final ResourceLocation TEXTURES_INVENTORY = new ResourceLocation(
31-
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_inventory.png");
31+
NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_inventory.png");
3232

3333
@Getter
3434
private EFabricatorPatternData data = null;
@@ -39,7 +39,7 @@ public GuiEFabricatorPatternSearch(final EFabricatorController controller, final
3939
this.ySize = 202 + 10;
4040
this.widgetController = new WidgetController(WidgetGui.of(this));
4141
this.widgetController.addWidget(new MultiLineLabel(Collections.singletonList(I18n.format("gui.efabricator.pattern_search.title")))
42-
.setScale(.8f).setAutoWrap(false).setAbsXY(7, 3)
42+
.setScale(.8f).setAutoWrap(false).setAbsXY(7, 3)
4343
);
4444
this.widgetController.addWidget(new SearchPanel(this.widgetController).setAbsXY(7, 15));
4545
this.widgetController.addWidget(new PatternPanel().setAbsXY(7, 39));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@Getter
2929
public class GuiEStorageController extends GuiContainerDynamic<ContainerEStorageController> {
3030
public static final ResourceLocation TEXTURES_BACKGROUND = new ResourceLocation(
31-
NovaEngineeringCore.MOD_ID, "textures/gui/estorage_controller.png");
31+
NovaEngineeringCore.MOD_ID, "textures/gui/estorage_controller.png");
3232

3333
protected List<EStorageCellData> cellDataList = new ArrayList<>();
3434
protected EStorageEnergyData energyData = null;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class GuiGeocentricDrill extends GuiContainerDynamic<ContainerGeocentricDrill> {
2727

2828
public static final ResourceLocation GUI_TEXTURE =
29-
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/guigeocentricdrill.png");
29+
new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/guigeocentricdrill.png");
3030

3131
private final OreControlList oreControlList = new OreControlList();
3232

@@ -49,9 +49,9 @@ public GuiGeocentricDrill(final GeocentricDrillController controller, final Enti
4949
this.dive.setWidthHeight(12, 12);
5050
this.dive.setAbsXY(142, 55);
5151
this.dive.setMouseDownTexture(TextureProperties.of(GUI_TEXTURE, 200, 20, 12, 12))
52-
.setHoveredTexture(TextureProperties.of(GUI_TEXTURE, 188, 20, 12, 12))
53-
.setUnavailableTexture(TextureProperties.of(GUI_TEXTURE, 212, 20, 12, 12))
54-
.setTexture(TextureProperties.of(GUI_TEXTURE, 176, 20, 12, 12));
52+
.setHoveredTexture(TextureProperties.of(GUI_TEXTURE, 188, 20, 12, 12))
53+
.setUnavailableTexture(TextureProperties.of(GUI_TEXTURE, 212, 20, 12, 12))
54+
.setTexture(TextureProperties.of(GUI_TEXTURE, 176, 20, 12, 12));
5555
this.dive.setTooltipFunction(button -> {
5656
boolean isControlDown = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
5757
if (isControlDown) {
@@ -68,9 +68,9 @@ public GuiGeocentricDrill(final GeocentricDrillController controller, final Enti
6868
this.ascend.setWidthHeight(12, 12);
6969
this.ascend.setAbsXY(157, 55);
7070
this.ascend.setMouseDownTexture(TextureProperties.of(GUI_TEXTURE, 200, 34, 12, 12))
71-
.setHoveredTexture(TextureProperties.of(GUI_TEXTURE, 188, 34, 12, 12))
72-
.setUnavailableTexture(TextureProperties.of(GUI_TEXTURE, 212, 34, 12, 12))
73-
.setTexture(TextureProperties.of(GUI_TEXTURE, 176, 34, 12, 12));
71+
.setHoveredTexture(TextureProperties.of(GUI_TEXTURE, 188, 34, 12, 12))
72+
.setUnavailableTexture(TextureProperties.of(GUI_TEXTURE, 212, 34, 12, 12))
73+
.setTexture(TextureProperties.of(GUI_TEXTURE, 176, 34, 12, 12));
7474
this.ascend.setTooltipFunction(button -> {
7575
boolean isControlDown = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
7676
if (isControlDown) {

0 commit comments

Comments
 (0)