Skip to content

Commit 4ecc9f6

Browse files
KasumiNovaKasumiNova
committed
- 统一 Log 调用。
1 parent 060b4db commit 4ecc9f6

File tree

22 files changed

+98
-72
lines changed

22 files changed

+98
-72
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212

1313
// Project properties
1414
group = "github.kasuminova.stellarcore"
15-
version = "1.3.3"
15+
version = "1.3.4"
1616

1717
// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
1818
java {

‎src/main/java/github/kasuminova/stellarcore/StellarCore.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import github.kasuminova.stellarcore.client.hitokoto.HitokotoAPI;
44
import github.kasuminova.stellarcore.common.CommonProxy;
55
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
6+
import github.kasuminova.stellarcore.common.util.StellarLog;
67
import github.kasuminova.stellarcore.mixin.StellarCoreEarlyMixinLoader;
78
import net.minecraftforge.fml.common.Mod;
89
import net.minecraftforge.fml.common.SidedProxy;
@@ -39,7 +40,7 @@ public class StellarCore {
3940
if (hitokoto == null || hitokoto.isEmpty()) {
4041
return;
4142
}
42-
StellarCoreEarlyMixinLoader.LOG.info(StellarCoreEarlyMixinLoader.LOG_PREFIX + hitokoto);
43+
StellarLog.LOG.info(StellarLog.LOG_PREFIX + hitokoto);
4344
});
4445
thread.setName("Stellar Core Hitokoto Initializer");
4546
thread.start();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import github.kasuminova.stellarcore.common.CommonProxy;
88
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
99
import github.kasuminova.stellarcore.common.mod.Mods;
10+
import github.kasuminova.stellarcore.common.util.StellarLog;
1011
import net.minecraftforge.common.MinecraftForge;
1112

1213
public class ClientProxy extends CommonProxy {
@@ -25,7 +26,7 @@ public void preInit() {
2526

2627
if (Mods.REPLAY.loaded() && StellarCoreConfig.PERFORMANCE.vanilla.hudCaching) {
2728
StellarCoreConfig.PERFORMANCE.vanilla.hudCaching = false;
28-
StellarCore.log.warn("Replay Mod is not compatible with Performance/HUDCaching feature, auto disabled!");
29+
StellarLog.LOG.warn("Replay Mod is not compatible with Performance/HUDCaching feature, auto disabled!");
2930
}
3031

3132
TitleUtils.setRandomTitle("*PreInit*");

‎src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import github.kasuminova.stellarcore.client.hudcaching.HUDCaching;
1111
import github.kasuminova.stellarcore.client.util.TitleUtils;
1212
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
13+
import github.kasuminova.stellarcore.common.util.StellarLog;
1314
import journeymap.common.feature.PlayerRadarManager;
1415
import mekanism.client.ClientTickHandler;
1516
import net.minecraft.client.Minecraft;
@@ -118,7 +119,7 @@ private static void callRPSIdeasItemBioticSensorWorldChanged() {
118119
triggeredBioticsRemote.setAccessible(true);
119120
((Map<EntityPlayer, List<EntityLivingBase>>) triggeredBioticsRemote.get(null)).clear();
120121
} catch (Throwable e) {
121-
StellarCore.log.warn("Failed to clear triggeredBioticsRemote in ItemBioticSensor.", e);
122+
StellarLog.LOG.warn("Failed to clear triggeredBioticsRemote in ItemBioticSensor.", e);
122123
}
123124
}
124125

‎src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.google.gson.GsonBuilder;
55
import github.kasuminova.stellarcore.StellarCore;
66
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
7+
import github.kasuminova.stellarcore.common.util.StellarLog;
78
import net.minecraft.util.JsonUtils;
89

910
import java.io.BufferedReader;
@@ -41,8 +42,8 @@ public static String getRandomHitokoto() {
4142
jsonStr = getStringFromURL(INTERNATIONAL_API_URL);
4243
} catch (IOException ex) {
4344
if (StellarCoreConfig.DEBUG.enableDebugLog) {
44-
StellarCore.log.warn("[DEBUG] Failed to fetch Hitokoto API.", e);
45-
StellarCore.log.warn(ex);
45+
StellarLog.LOG.warn("[DEBUG] Failed to fetch Hitokoto API.", e);
46+
StellarLog.LOG.warn(ex);
4647
}
4748
return "";
4849
}
@@ -57,7 +58,7 @@ public static String getRandomHitokoto() {
5758
hitokoto = JsonUtils.fromJson(DESERIALIZER, jsonStr, HitokotoResult.class, true);
5859
} catch (Exception e) {
5960
if (StellarCoreConfig.DEBUG.enableDebugLog) {
60-
StellarCore.log.warn("[DEBUG] Failed to fetch Hitokoto API.", e);
61+
StellarLog.LOG.warn("[DEBUG] Failed to fetch Hitokoto API.", e);
6162
}
6263
return "";
6364
}

‎src/main/java/github/kasuminova/stellarcore/client/resource/ResourceExistingCache.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package github.kasuminova.stellarcore.client.resource;
22

3+
import github.kasuminova.stellarcore.common.util.StellarLog;
34
import github.kasuminova.stellarcore.mixin.StellarCoreEarlyMixinLoader;
45
import github.kasuminova.stellarcore.mixin.util.StellarCoreResourcePack;
56
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
@@ -18,17 +19,17 @@ public static void addResourcePack(StellarCoreResourcePack resourcePack) {
1819
public static void clear() {
1920
RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$disableCache);
2021
RESOURCE_PACKS.clear();
21-
StellarCoreEarlyMixinLoader.LOG.info("[StellarCore-ResourceExistingCache] Resource cache cleared.");
22+
StellarLog.LOG.info("[StellarCore-ResourceExistingCache] Resource cache cleared.");
2223
}
2324

2425
public static void enableCache() {
2526
RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$enableCache);
26-
StellarCoreEarlyMixinLoader.LOG.info("[StellarCore-ResourceExistingCache] Resource cache enabled.");
27+
StellarLog.LOG.info("[StellarCore-ResourceExistingCache] Resource cache enabled.");
2728
}
2829

2930
public static void disableCache() {
3031
RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$disableCache);
31-
StellarCoreEarlyMixinLoader.LOG.info("[StellarCore-ResourceExistingCache] Resource cache disabled.");
32+
StellarLog.LOG.info("[StellarCore-ResourceExistingCache] Resource cache disabled.");
3233
}
3334

3435
}

‎src/main/java/github/kasuminova/stellarcore/client/texture/StitcherCache.java‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import github.kasuminova.stellarcore.StellarCore;
44
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
55
import github.kasuminova.stellarcore.common.util.LargeNBTUtils;
6+
import github.kasuminova.stellarcore.common.util.StellarLog;
7+
import github.kasuminova.stellarcore.mixin.StellarCoreEarlyMixinLoader;
68
import github.kasuminova.stellarcore.mixin.minecraft.stitcher.AccessorStitcher;
79
import github.kasuminova.stellarcore.mixin.util.AccessorStitcherHolder;
810
import github.kasuminova.stellarcore.mixin.util.AccessorStitcherSlot;
@@ -56,16 +58,16 @@ private StitcherCache(final String name, final TextureMap cacheFor) {
5658
this.cacheFile = new File(CACHE_FILE_NAME.replace("{}", name));
5759
this.cacheFor = cacheFor;
5860
this.readTask = CompletableFuture.runAsync(this::readFromFile);
59-
StellarCore.log.info("[StellarCore-StitcherCache] Created stitcher cache for `{}`.", cacheFor.getBasePath());
60-
StellarCore.log.info("[StellarCore-StitcherCache] Stitcher file cache `{}` reader task started.", cacheFor.getBasePath());
61+
StellarLog.LOG.info("[StellarCore-StitcherCache] Created stitcher cache for `{}`.", cacheFor.getBasePath());
62+
StellarLog.LOG.info("[StellarCore-StitcherCache] Stitcher file cache `{}` reader task started.", cacheFor.getBasePath());
6163
}
6264

6365
public static StitcherCache create(final String name, final TextureMap cacheFor) {
6466
StitcherCache cache = CREATED_STITCHER_CACHE.get(cacheFor);
6567
if (cache != null) {
6668
cache.checkReadTaskState();
6769
cache.readTask = CompletableFuture.runAsync(cache::readFromFile);
68-
StellarCore.log.info("[StellarCore-StitcherCache] Stitcher file cache `{}` reader task restarted.", cacheFor.getBasePath());
70+
StellarLog.LOG.info("[StellarCore-StitcherCache] Stitcher file cache `{}` reader task restarted.", cacheFor.getBasePath());
6971
return cache;
7072
}
7173
cache = new StitcherCache(name, cacheFor);
@@ -96,16 +98,16 @@ public void writeToFile() {
9698
FileOutputStream fos = new FileOutputStream(cacheFile);
9799
CompressedStreamTools.writeCompressed(toNBT(), fos);
98100
fos.close();
99-
StellarCore.log.info("[StellarCore-StitcherCache] Successfully write stitcher cache file to `{}`.", cacheFile.getAbsolutePath());
101+
StellarLog.LOG.info("[StellarCore-StitcherCache] Successfully write stitcher cache file to `{}`.", cacheFile.getAbsolutePath());
100102
} catch (Throwable e) {
101-
StellarCore.log.error("[StellarCore-StitcherCache] Failed to write stitcher cache file! Please report it.", e);
103+
StellarLog.LOG.error("[StellarCore-StitcherCache] Failed to write stitcher cache file! Please report it.", e);
102104
}
103105
}
104106

105107
public void readFromFile() {
106108
if (!cacheFile.exists()) {
107109
this.cacheState = State.UNAVAILABLE;
108-
StellarCore.log.info("[StellarCore-StitcherCache] Stitcher cache file is unavailable (File not found).");
110+
StellarLog.LOG.info("[StellarCore-StitcherCache] Stitcher cache file is unavailable (File not found).");
109111
return;
110112
}
111113

@@ -115,7 +117,7 @@ public void readFromFile() {
115117
readTag = LargeNBTUtils.readCompressed(fis);
116118
fis.close();
117119
this.cacheState = State.TAG_READY;
118-
StellarCore.log.info("[StellarCore-StitcherCache] Successfully read stitcher cache file from `{}`.", cacheFile.getAbsolutePath());
120+
StellarLog.LOG.info("[StellarCore-StitcherCache] Successfully read stitcher cache file from `{}`.", cacheFile.getAbsolutePath());
119121
} catch (Throwable e) {
120122
if (fis != null) {
121123
try {
@@ -124,7 +126,7 @@ public void readFromFile() {
124126
}
125127
}
126128
this.cacheState = State.UNAVAILABLE;
127-
StellarCore.log.warn("[StellarCore-StitcherCache] Failed to read stitcher cache file, it may be broken.", e);
129+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Failed to read stitcher cache file, it may be broken.", e);
128130
}
129131
}
130132

@@ -138,34 +140,34 @@ public void parseTag(final Stitcher stitcher, final Set<Stitcher.Holder> targetH
138140
try {
139141
fromNBT(readTag, stitcher);
140142
this.cacheState = holdersEquals(targetHolders) ? State.AVAILABLE : State.UNAVAILABLE;
141-
StellarCore.log.info("[StellarCore-StitcherCache] Stitcher cache parsed, state: {}.", this.cacheState);
143+
StellarLog.LOG.info("[StellarCore-StitcherCache] Stitcher cache parsed, state: {}.", this.cacheState);
142144
} catch (Throwable e) {
143-
StellarCore.log.warn("[StellarCore-StitcherCache] Failed to parse stitcher cache file, it may be broken.", e);
145+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Failed to parse stitcher cache file, it may be broken.", e);
144146
}
145147
}
146148

147149
public boolean holdersEquals(Set<Stitcher.Holder> targetHolders) {
148150
if (targetHolders.size() != this.holders.size()) {
149-
StellarCore.log.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holders size not equals ({} ≠ {}).", targetHolders.size(), this.holders.size());
151+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holders size not equals ({} ≠ {}).", targetHolders.size(), this.holders.size());
150152
return false;
151153
}
152154
Map<String, Stitcher.Holder> holders = new Object2ObjectOpenHashMap<>(this.holders);
153155
for (final Stitcher.Holder holder : targetHolders) {
154156
Stitcher.Holder cachedHolder = holders.get(holder.getAtlasSprite().getIconName());
155157
if (cachedHolder == null || !holderEquals(cachedHolder, holder)) {
156158
if (cachedHolder == null) {
157-
StellarCore.log.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holder `{}` not found in cache.", holder.getAtlasSprite().getIconName());
159+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holder `{}` not found in cache.", holder.getAtlasSprite().getIconName());
158160
} else {
159-
StellarCore.log.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holder `{}` not equals.", holder.getAtlasSprite().getIconName());
161+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, holder `{}` not equals.", holder.getAtlasSprite().getIconName());
160162
}
161163
return false;
162164
}
163165
holders.remove(holder.getAtlasSprite().getIconName());
164166
}
165167
if (!holders.isEmpty()) {
166-
StellarCore.log.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, {} holders not found in runtime.", holders.size());
168+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Stitcher cache is unavailable, {} holders not found in runtime.", holders.size());
167169
if (StellarCoreConfig.DEBUG.enableDebugLog) {
168-
holders.keySet().forEach(holderName -> StellarCore.log.warn("[StellarCore-StitcherCache] Holder `{}` not found in runtime.", holderName));
170+
holders.keySet().forEach(holderName -> StellarLog.LOG.warn("[StellarCore-StitcherCache] Holder `{}` not found in runtime.", holderName));
169171
}
170172
return false;
171173
}
@@ -283,7 +285,7 @@ private void checkReadTaskState() {
283285
try {
284286
readTask.get();
285287
} catch (Throwable e) {
286-
StellarCore.log.error("[StellarCore-StitcherCache] Failed to read stitcher cache file! Please report it.", e);
288+
StellarLog.LOG.error("[StellarCore-StitcherCache] Failed to read stitcher cache file! Please report it.", e);
287289
}
288290
}
289291
}
@@ -297,7 +299,7 @@ private void fromNBT(NBTTagCompound tag, Stitcher stitcher) {
297299
IntStream.range(0, holdersTagList.tagCount()).mapToObj(holdersTagList::getCompoundTagAt).forEach(holderTag -> {
298300
Stitcher.Holder holder = readHolderNBT(holderTag, stitcher);
299301
if (holder == null) {
300-
StellarCore.log.warn("[StellarCore-StitcherCache] Found null holder cache: `{}`, ignored.", holderTag.getString("sprite"));
302+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Found null holder cache: `{}`, ignored.", holderTag.getString("sprite"));
301303
return;
302304
}
303305
holders.put(holder.getAtlasSprite().getIconName(), holder);
@@ -380,25 +382,25 @@ private static boolean holderEquals(Stitcher.Holder self, Stitcher.Holder anothe
380382
if (selfAccessor.scaleFactor() == anotherHolderAccessor.scaleFactor()) {
381383
return true;
382384
} else {
383-
StellarCore.log.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (ScaleFactor {} ≠ {}).",
385+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (ScaleFactor {} ≠ {}).",
384386
self.getAtlasSprite().getIconName(), another.getAtlasSprite().getIconName(),
385387
selfAccessor.scaleFactor(), anotherHolderAccessor.scaleFactor()
386388
);
387389
}
388390
} else {
389-
StellarCore.log.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Rotated {} ≠ {}).",
391+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Rotated {} ≠ {}).",
390392
self.getAtlasSprite().getIconName(), another.getAtlasSprite().getIconName(),
391393
self.isRotated(), another.isRotated()
392394
);
393395
}
394396
} else {
395-
StellarCore.log.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Height {} ≠ {}).",
397+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Height {} ≠ {}).",
396398
self.getAtlasSprite().getIconName(), another.getAtlasSprite().getIconName(),
397399
selfAccessor.realHeight(), anotherHolderAccessor.realHeight()
398400
);
399401
}
400402
} else {
401-
StellarCore.log.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Width {} ≠ {}).",
403+
StellarLog.LOG.warn("[StellarCore-StitcherCache] Holder `{}` and `{}` are not equal (Width {} ≠ {}).",
402404
self.getAtlasSprite().getIconName(), another.getAtlasSprite().getIconName(),
403405
selfAccessor.realWidth(), anotherHolderAccessor.realWidth()
404406
);

‎src/main/java/github/kasuminova/stellarcore/client/util/TitleUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import github.kasuminova.stellarcore.StellarCore;
44
import github.kasuminova.stellarcore.client.hitokoto.HitokotoAPI;
55
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
6+
import github.kasuminova.stellarcore.common.util.StellarLog;
67
import github.kasuminova.stellarcore.mixin.StellarCoreEarlyMixinLoader;
78
import org.lwjgl.opengl.Display;
89

@@ -126,7 +127,7 @@ private static void setTitle() {
126127
glfwSetWindowTitle.invoke(null, result, currentTitle);
127128
}
128129
} catch (Exception e) {
129-
StellarCore.log.warn("Failed to set CleanroomLoader title, maybe platform is unsupported.", e);
130+
StellarLog.LOG.warn("Failed to set CleanroomLoader title, maybe platform is unsupported.", e);
130131
unsupportedPlatform = true;
131132
}
132133
return;

‎src/main/java/github/kasuminova/stellarcore/common/bugfix/TileEntityContainerFixes.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import github.kasuminova.stellarcore.StellarCore;
44
import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
55
import github.kasuminova.stellarcore.common.util.ContainerTECache;
6+
import github.kasuminova.stellarcore.common.util.StellarLog;
67
import net.minecraft.entity.player.EntityPlayer;
78
import net.minecraft.inventory.Container;
89
import net.minecraft.tileentity.TileEntity;
@@ -45,7 +46,7 @@ public void onPlayerTick(final TickEvent.PlayerTickEvent event) {
4546
World world = te.getWorld();
4647
if (te.isInvalid() || world == null || !world.isBlockLoaded(pos) || world.getTileEntity(pos) != te) {
4748
player.closeScreen();
48-
StellarCore.log.warn(String.format(
49+
StellarLog.LOG.warn(String.format(
4950
"Detected invalid TileEntity GUI, World: %s, Pos: %s, GUI Class: %s, TileEntity Class: %s",
5051
world == null ? "null" : world.getWorldInfo().getWorldName(),
5152
posToString(pos),

‎src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import github.kasuminova.stellarcore.StellarCore;
44
import github.kasuminova.stellarcore.common.mod.Mods;
5+
import github.kasuminova.stellarcore.common.util.StellarLog;
56
import net.minecraftforge.fml.common.Loader;
67
import net.minecraftforge.fml.common.Optional;
78
import sonar.fluxnetworks.common.handler.TileEntityHandler;
@@ -20,7 +21,7 @@ public static void initMekanismIntegration() {
2021
//在列表头部插入适配器，保证不被其他类型覆盖结果。
2122
//Insert adapters in the head of the list to ensure that the results are not overwritten by other types.
2223
TileEntityHandler.tileEnergyHandlers.add(0, MekanismEnergyHandler.INSTANCE);
23-
StellarCore.log.info("Mekanism <===> FluxNetworks is initialized!");
24+
StellarLog.LOG.info("Mekanism <===> FluxNetworks is initialized!");
2425
}
2526

2627
}

0 commit comments

Comments
 (0)