Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix package name for NEI optional annotation #20

Merged
merged 1 commit into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
Expand All @@ -25,5 +26,13 @@ whitelist.json
*.iml
*.ipr
*.iws
src/main/resources/mixins.*.json
src/main/resources/mixins.*([!.]).json
*.bat
*.DS_Store
!gradlew.bat
.factorypath
addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
layout.json
21 changes: 2 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,10 @@ enableGenericInjection = false
# Generate a class with a String field for the mod version named as defined below.
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
generateGradleTokenClass =
generateGradleTokenClass = com.enderio.core.EnderCoreTags

# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = GRADLETOKEN_VERSION

# [DEPRECATED] Mod ID replacement token.
gradleTokenModId =

# [DEPRECATED] Mod name replacement token.
gradleTokenModName =

# [DEPRECATED] Mod Group replacement token.
gradleTokenGroupName =

# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile = EnderCore.java
gradleTokenVersion = VERSION

# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/enderio/core/EnderCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,14 @@
@Mod(
modid = EnderCore.MODID,
name = EnderCore.NAME,
version = EnderCore.VERSION,
version = EnderCoreTags.VERSION,
dependencies = "after:ttCore; after:gtnhlib@[0.0.10,)",
guiFactory = "com.enderio.core.common.config.BaseConfigFactory")
public class EnderCore implements IEnderMod {

public static final String MODID = "endercore";
public static final String NAME = "EnderCore";
public static final String BASE_PACKAGE = "com.enderio";
public static final String VERSION = "GRADLETOKEN_VERSION";

public static final Logger logger = LogManager.getLogger(NAME);
public static final Lang lang = new Lang(MODID);
Expand Down Expand Up @@ -155,6 +154,6 @@ public String name() {

@Override
public String version() {
return VERSION;
return EnderCoreTags.VERSION;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import cpw.mods.fml.common.Optional;

@Optional.InterfaceList({ @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems"),
@Optional.Interface(iface = "codechicken.nei.api.guihook.IContainerObjectHandler", modid = "NotEnoughItems") })
@Optional.Interface(iface = "codechicken.nei.guihook.IContainerObjectHandler", modid = "NotEnoughItems") })
public abstract class GuiContainerBase extends GuiContainer
implements ToolTipRenderer, IGuiScreen, INEIGuiHandler, IContainerObjectHandler {

Expand Down