Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tier940 committed Sep 11, 2024
1 parent 54b368a commit 179c580
Show file tree
Hide file tree
Showing 23 changed files with 75 additions and 54 deletions.
8 changes: 8 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,13 @@
* For more details, see https://docs.gradle.org/8.4/userguide/java_library_plugin.html#sec:java_library_configurations_graph
*/
dependencies {
// Published dependencies
api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358
api("com.cleanroommc:groovyscript:1.1.2") { transitive = false } // GrS 1.1.2
api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700
api("appeng:ae2-uel:v0.56.4") { transitive = false } // AE2 0.56.4(IAEWrench access error)
api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31

// Hard Dependencies
devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ modName = TestMod
# This is a case-sensitive string to identify your mod. Convention is to use lower case.
modId = testmod

modGroup = gtexpert.testmod
modGroup = com.github.gtexpert.testmod

# Version of your mod.
# This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
modVersion = 1.0.0

# Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
includeMCVersionJar = false
includeMCVersionJar = true

# The name of your jar when you produce builds, not including any versioning info
modArchivesBaseName = testmod
Expand Down Expand Up @@ -44,7 +44,7 @@ enableModernJavaSyntax = true
enableJava17RunTasks = false

# Generate a class with String fields for the mod id, name and version named with the fields below
generateGradleTokenClass = gtexpert.testmod.Tags
generateGradleTokenClass = com.github.gtexpert.testmod.Tags
gradleTokenModId = MODID
gradleTokenModName = MODNAME
gradleTokenVersion = VERSION
Expand Down Expand Up @@ -78,7 +78,7 @@ coreModClass =
containsMixinsAndOrCoreModOnly = false

# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
forceEnableMixins = false
forceEnableMixins = true

# Outputs pre-transformed and post-transformed loaded classes to run/CLASSLOADER_TEMP. Can be used in combination with
# diff to see exactly what your ASM or Mixins are changing in the target file.
Expand Down Expand Up @@ -178,7 +178,7 @@ mavenArtifactGroup =
# By default this will use the files found here: https://github.com/GTModpackTeam/Buildscripts/tree/master/spotless
# to format your code. However, you can create your own version of these files and place them in your project's
# root directory to apply your own formatting options instead.
enableSpotless = false
enableSpotless = true

# Enable JUnit testing platform used for testing your code.
# Uses JUnit 5. See guide and documentation here: https://junit.org/junit5/docs/current/user-guide/
Expand Down
11 changes: 11 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ plugins {
id 'com.diffplug.blowdryerSetup' version '1.7.0'
// Automatic toolchain provisioning
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
id 'com.gradle.enterprise' version '3.18.1'
}

gradleEnterprise {
if (System.getenv("CI") != null) {
buildScan {
publishAlways()
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
}
}

blowdryerSetup {
Expand Down
4 changes: 3 additions & 1 deletion spotless/spotless.importorder
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#Organize Import Order
#Sat Jan 28 17:57:48 GMT 2023
0=java
1=javax
2=net
3=org
4=com
5=gregtech
6=gregicality
7=com.github.gtexpert
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gtexpert.testmod;
package com.github.gtexpert.testmod;

import gtexpert.testmod.api.util.ModLog;
import gtexpert.testmod.module.ModuleManager;
import gtexpert.testmod.module.Modules;
import com.github.gtexpert.testmod.api.util.ModLog;
import com.github.gtexpert.testmod.module.ModuleManager;
import com.github.gtexpert.testmod.module.Modules;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/github/gtexpert/testmod/api/ModValues.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.github.gtexpert.testmod.api;

import com.github.gtexpert.testmod.Tags;

public class ModValues {
public static final String MODID = Tags.MODID;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;


import java.util.Collections;
Expand Down Expand Up @@ -91,4 +91,4 @@ default boolean processIMC(FMLInterModComms.IMCMessage message) {
*/
@NotNull
Logger getLogger();
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;

public interface IModuleContainer {
/**
* The ID of this container. If this is your mod's only container, you should use your mod ID to prevent collisions.
*/
String getID();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;

import gtexpert.testmod.api.util.ModUtility;
import com.github.gtexpert.testmod.api.util.ModUtility;
import net.minecraft.util.ResourceLocation;

public interface IModuleManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.modules;
package com.github.gtexpert.testmod.api.modules;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.util;
package com.github.gtexpert.testmod.api.util;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gtexpert.testmod.api.util;
package com.github.gtexpert.testmod.api.util;

import gtexpert.testmod.Tags;
import com.github.gtexpert.testmod.Tags;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gtexpert.testmod.api.util;
package com.github.gtexpert.testmod.api.util;

import gtexpert.testmod.api.ModValues;
import com.github.gtexpert.testmod.api.ModValues;
import net.minecraft.util.ResourceLocation;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gtexpert.testmod.api.util;
package com.github.gtexpert.testmod.api.util;

import java.lang.reflect.Field;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gtexpert.testmod.client;
package com.github.gtexpert.testmod.client;

import gtexpert.testmod.common.CommonProxy;
import com.github.gtexpert.testmod.common.CommonProxy;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gtexpert.testmod.common;
package com.github.gtexpert.testmod.common;

import gtexpert.testmod.api.ModValues;
import com.github.gtexpert.testmod.api.ModValues;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package gtexpert.testmod.core;
package com.github.gtexpert.testmod.core;

import gtexpert.testmod.Tags;
import gtexpert.testmod.api.ModValues;
import gtexpert.testmod.api.modules.IModule;
import gtexpert.testmod.api.modules.TModule;
import gtexpert.testmod.common.CommonProxy;
import gtexpert.testmod.module.Modules;
import com.github.gtexpert.testmod.Tags;
import com.github.gtexpert.testmod.api.ModValues;
import com.github.gtexpert.testmod.api.modules.IModule;
import com.github.gtexpert.testmod.api.modules.TModule;
import com.github.gtexpert.testmod.common.CommonProxy;
import com.github.gtexpert.testmod.module.Modules;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import org.apache.logging.log4j.LogManager;
Expand All @@ -23,8 +23,8 @@
public class CoreModule implements IModule {
public static final Logger logger = LogManager.getLogger(Tags.MODNAME + " Core");
@SidedProxy(modId = ModValues.MODID,
clientSide = "gtexpert.testmod.client.ClientProxy",
serverSide = "gtexpert.testmod.common.CommonProxy")
clientSide = "com.github.gtexpert.testmod.client.ClientProxy",
serverSide = "com.github.gtexpert.testmod.common.CommonProxy")
public static CommonProxy proxy;

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gtexpert.testmod.module;
package com.github.gtexpert.testmod.module;

import gtexpert.testmod.api.modules.IModule;
import gtexpert.testmod.api.util.ModUtility;
import com.github.gtexpert.testmod.api.modules.IModule;
import com.github.gtexpert.testmod.api.util.ModUtility;
import net.minecraft.util.ResourceLocation;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package gtexpert.testmod.module;
package com.github.gtexpert.testmod.module;

import java.io.File;
import java.util.*;
import java.util.stream.Collectors;

import gtexpert.testmod.api.ModValues;
import gtexpert.testmod.api.modules.*;
import com.github.gtexpert.testmod.api.ModValues;
import com.github.gtexpert.testmod.api.modules.*;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gtexpert.testmod.module;
package com.github.gtexpert.testmod.module;

import gtexpert.testmod.api.ModValues;
import gtexpert.testmod.api.modules.IModuleContainer;
import com.github.gtexpert.testmod.api.ModValues;
import com.github.gtexpert.testmod.api.modules.IModuleContainer;

public class Modules implements IModuleContainer {

Expand Down
7 changes: 0 additions & 7 deletions src/main/java/gtexpert/testmod/api/ModValues.java

This file was deleted.

0 comments on commit 179c580

Please sign in to comment.