Skip to content
This repository was archived by the owner on Aug 6, 2023. It is now read-only.

Commit 29ea6d8

Browse files
faceofcatfaceofcat
committed
updated gradle to 4.4.1; added config class to get gui and such; badly fixes #7: Add NBT information to tooltip;
1 parent 5a40851 commit 29ea6d8

7 files changed

Lines changed: 116 additions & 73 deletions

File tree

‎gradle/wrapper/gradle-wrapper.jar‎

1.02 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 14 12:28:28 PDT 2015
1+
#Tue Feb 27 12:14:24 EET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

‎gradlew‎

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/com/mcmoddev/mmdlogger/MMDLogger.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package com.mcmoddev.mmdlogger;
22

3-
import net.minecraftforge.oredict.OreDictionary;
43
import java.util.HashMap;
54
import java.util.List;
65
import java.util.Map;
7-
86
import org.apache.logging.log4j.LogManager;
97
import org.apache.logging.log4j.Logger;
10-
118
import net.minecraft.item.Item;
129
import net.minecraft.item.ItemStack;
1310
import net.minecraftforge.common.MinecraftForge;
14-
import net.minecraftforge.common.config.Configuration;
1511
import net.minecraftforge.fml.common.Mod;
1612
import net.minecraftforge.fml.common.Mod.EventHandler;
1713
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
1814
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
15+
import net.minecraftforge.oredict.OreDictionary;
1916

2017
/**
2118
* @author SkyBlade1978
@@ -29,36 +26,40 @@ public class MMDLogger {
2926
protected static final Map<String, String> ItemToOreDictMap = new HashMap<>();
3027

3128
private Logger logger;
32-
private boolean loggingOn = false;
33-
protected static boolean tooltipsOn = false;
29+
// private boolean loggingOn = true;
30+
// protected static boolean oreDictTooltipsOn = true;
31+
// protected static boolean nbtTooltipsOn = true;
3432

3533
@EventHandler
3634
public void preInit(FMLPreInitializationEvent event)
3735
{
3836
MinecraftForge.EVENT_BUS.register(new MMDLoggerEventBusSubscriber());
3937

40-
Configuration modConfig = new Configuration(event.getSuggestedConfigurationFile());
41-
modConfig.load();
38+
// Configuration modConfig = new Configuration(event.getSuggestedConfigurationFile());
39+
// modConfig.load();
4240

43-
final String OPTIONS = "options";
41+
// final String OPTIONS = "options";
4442

45-
loggingOn = modConfig.getBoolean("OREDICT_LOGGING", OPTIONS, loggingOn,
46-
"If true, then ore dict names and corresponding id's are logged");
47-
48-
tooltipsOn = modConfig.getBoolean("OREDICT_TOOLTIPS", OPTIONS, tooltipsOn,
49-
"If true, then ore dict names are displayed in tooltips");
50-
51-
modConfig.save();
43+
// loggingOn = modConfig.getBoolean("OREDICT_LOGGING", OPTIONS, loggingOn,
44+
// "If true, then ore dict names and corresponding id's are logged.");
45+
//
46+
// oreDictTooltipsOn = modConfig.getBoolean("OREDICT_TOOLTIPS", OPTIONS, oreDictTooltipsOn,
47+
// "If true, then ore dict names are displayed in tooltips.");
48+
//
49+
// nbtTooltipsOn = modConfig.getBoolean("NBT_TOOLTIPS", OPTIONS, nbtTooltipsOn,
50+
// "If true, then item stack's nbt is displayed in tooltips.");
51+
//
52+
// modConfig.save();
5253

53-
if (loggingOn) {
54+
if (MMDLoggerConfig.options.loggingOn) {
5455
logger = LogManager.getFormatterLogger(MMDLogger.MODID);
5556
}
5657
}
5758

5859
@EventHandler
5960
public void postInit(FMLPostInitializationEvent event)
6061
{
61-
if (loggingOn || tooltipsOn) {
62+
if (MMDLoggerConfig.options.loggingOn || MMDLoggerConfig.options.oreDictTooltipsOn) {
6263
for (String oreName : OreDictionary.getOreNames()) {
6364
int oreID = OreDictionary.getOreID(oreName);
6465
List<ItemStack> items = OreDictionary.getOres(oreName);
@@ -70,7 +71,7 @@ public void postInit(FMLPostInitializationEvent event)
7071

7172
ItemToOreDictMap.put(item.getRegistryName().getResourceDomain() + ":" + item.getRegistryName().getResourcePath() + ":" + meta, oreName);
7273

73-
if (loggingOn)
74+
if (MMDLoggerConfig.options.loggingOn)
7475
logger.info("Ore Dictionary Entry: Ore Name: %s, Ore ID: %s, Unlocalised Name: %s, Block ID: %s, Block Meta: %s, Registry Name: %s", oreName, oreID, item.getUnlocalizedName(), Item.getIdFromItem(item), meta, item.getRegistryName());
7576
}
7677
}

‎src/main/java/com/mcmoddev/mmdlogger/MMDLoggerConfig.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.mcmoddev.mmdlogger;
2+
3+
import net.minecraftforge.common.config.Config;
4+
import net.minecraftforge.common.config.ConfigManager;
5+
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
6+
import net.minecraftforge.fml.common.Mod;
7+
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
8+
9+
@Config(modid = MMDLogger.MODID)
10+
public class MMDLoggerConfig {
11+
public static Options options = new Options();
12+
13+
public static class Options {
14+
@Config.Comment("If true, then ore dict names and corresponding id's are logged.")
15+
public boolean loggingOn = false;
16+
17+
@Config.Comment("If true, then ore dict names are displayed in tooltips.")
18+
public boolean oreDictTooltipsOn = false;
19+
20+
@Config.Comment("If true, then item stack's nbt is displayed in tooltips.")
21+
public boolean nbtTooltipsOn = false;
22+
}
23+
24+
@Mod.EventBusSubscriber(modid = MMDLogger.MODID)
25+
public static class ConfigSyncHandler
26+
{
27+
@SubscribeEvent
28+
public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event)
29+
{
30+
if(event.getModID().equals(MMDLogger.MODID))
31+
{
32+
ConfigManager.sync(MMDLogger.MODID, Config.Type.INSTANCE);
33+
}
34+
}
35+
}
36+
}

‎src/main/java/com/mcmoddev/mmdlogger/MMDLoggerEventBusSubscriber.java‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,45 @@
11
package com.mcmoddev.mmdlogger;
22

33
import java.util.List;
4-
54
import net.minecraft.item.Item;
65
import net.minecraft.item.ItemStack;
6+
import net.minecraft.nbt.NBTTagCompound;
77
import net.minecraft.util.text.TextFormatting;
88
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
99
import net.minecraftforge.fml.common.Mod;
1010
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1111

1212
@Mod.EventBusSubscriber(modid = MMDLogger.MODID)
1313
public class MMDLoggerEventBusSubscriber {
14-
1514
@SubscribeEvent
16-
public void onToolTip(ItemTooltipEvent event)
15+
public static void onToolTip(ItemTooltipEvent event)
1716
{
18-
if (MMDLogger.tooltipsOn) {
19-
ItemStack stack = event.getItemStack();
20-
Item item = stack.getItem();
21-
22-
if (item == null)
23-
return;
24-
25-
String blockName = item.getRegistryName().getResourceDomain() + ":" + item.getRegistryName().getResourcePath();
26-
int meta = item.getMetadata(stack);
27-
28-
29-
String oreName = MMDLogger.ItemToOreDictMap.get(blockName + ":" + meta);
30-
31-
List<String> tooltips = event.getToolTip();
32-
33-
if (oreName != null) {
34-
tooltips.add(TextFormatting.BLUE.toString() + TextFormatting.ITALIC.toString() + oreName);
35-
}
36-
17+
List<String> tooltips = event.getToolTip();
18+
19+
if (MMDLoggerConfig.options.oreDictTooltipsOn) {
20+
ItemStack stack = event.getItemStack();
21+
Item item = stack.getItem();
22+
23+
if (item == null)
24+
return;
25+
26+
// ore dictionary
27+
String blockName = item.getRegistryName().getResourceDomain() + ":" + item.getRegistryName().getResourcePath();
28+
int meta = item.getMetadata(stack);
29+
30+
String oreName = MMDLogger.ItemToOreDictMap.get(blockName + ":" + meta);
31+
32+
if (oreName != null) {
33+
tooltips.add(TextFormatting.BLUE.toString() + TextFormatting.ITALIC.toString() + oreName);
34+
}
35+
}
36+
37+
if (MMDLoggerConfig.options.nbtTooltipsOn) {
38+
// nbt
39+
NBTTagCompound stackNbt = event.getItemStack().getTagCompound();
40+
if ((stackNbt != null) && !stackNbt.hasNoTags()) {
41+
tooltips.add(TextFormatting.GRAY + "NBT: " + stackNbt.toString());
42+
}
3743
}
3844
}
3945
}

0 commit comments

Comments
 (0)