Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Sep 26, 2024
1 parent b395fec commit 0e140d1
Show file tree
Hide file tree
Showing 9 changed files with 1,635 additions and 1,630 deletions.
1,615 changes: 6 additions & 1,609 deletions build.gradle

Large diffs are not rendered by default.

1,613 changes: 1,613 additions & 0 deletions build.gradle.old

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
gtnh.settings.blowdryerTag = 0.2.2
modName = ProgrammableHatches

# This is a case-sensitive string to identify your mod. Convention is to use lower case.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 0 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ goto fail
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar



@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain --build-cache %*

Expand Down
18 changes: 5 additions & 13 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

pluginManagement {
repositories {
maven {
// RetroFuturaGradle
name "GTNH Maven"
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
url "https://nexus.gtnewhorizons.com/repository/public/"
mavenContent {
includeGroup("com.gtnewhorizons.retrofuturagradle")
includeGroup("com.gtnewhorizons")
includeGroupByRegex("com\\.gtnewhorizons\\..+")
}
}
gradlePluginPortal()
Expand All @@ -17,12 +16,5 @@ pluginManagement {
}

plugins {
id 'com.diffplug.blowdryerSetup' version '1.6.0'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
}

blowdryerSetup {
repoSubfolder 'gtnhShared'
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.2')
//devLocal '.' // Use this when testing config updates locally
}
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
}
2 changes: 1 addition & 1 deletion src/main/java/reobf/proghatches/main/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void preInit(FMLPreInitializationEvent event) {
Config.synchronizeConfiguration(event.getSuggestedConfigurationFile());

MyMod.LOG.info(Config.greeting);
MyMod.LOG.info("I am " + Tags.MODNAME + " at version " + Tags.VERSION);
MyMod.LOG.info("I am " + MyMod.MODNAME + " at version " + Tags.VERSION);

GameRegistry.registerTileEntity(TileIOHub.class, "proghatches.iohub");
GameRegistry.registerTileEntity(TileWirelessPeripheralStation.class, "proghatches.peripheral_station");
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/reobf/proghatches/main/MyMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,16 @@
import tconstruct.armor.player.TPlayerStats;
import thaumcraft.common.entities.golems.ItemGolemCore;

@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:appliedenergistics2;required-after:gregtech;", acceptableRemoteVersions = "*"
@Mod(modid = MyMod.MODID, version = Tags.VERSION, name = MyMod.MODNAME, acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:appliedenergistics2;required-after:gregtech;", acceptableRemoteVersions = "*"
/*
* ,dependencies= "required-after:neenergistics;"
*/
)
public class MyMod {
public static final Logger LOG = LogManager.getLogger(Tags.MODID);

final public static String MODID="programmablehatches";
final public static String MODNAME="ProgrammableHatches";
public static final Logger LOG = LogManager.getLogger(MODID);
public static MyMod instance;
{
//GT_MetaTileEntity_MultiBlockBase.class.getDeclaredFields();
Expand Down Expand Up @@ -210,7 +213,7 @@ public int getItemStackLimit() {
// public static ShutDownReason ACCESS_LOOP=new
// SimpleShutDownReason("proghatch.access_loop", true){public String getID()
// {return "proghatch.access_loop";};};
public static SimpleNetworkWrapper net = new SimpleNetworkWrapper(Tags.MODID);
public static SimpleNetworkWrapper net = new SimpleNetworkWrapper( MyMod.MODID);
public static Item progcircuit;
public static Item toolkit;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

import cpw.mods.fml.relauncher.FMLLaunchHandler;
import reobf.proghatches.Tags;

import reobf.proghatches.main.MyMod;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
Expand Down Expand Up @@ -308,7 +308,7 @@ private boolean loadJarOf( Map<String, String> classTrait) {
}
}

public static final Logger LOG = LogManager.getLogger(Tags.MODID + "Mixin");
public static final Logger LOG = LogManager.getLogger( MyMod.MODID + "Mixin");
private static final Path MODS_DIRECTORY_PATH = new File(Launch.minecraftHome, "mods/").toPath();

public static List<File> findJarOf(final Map<String, String> classTrait) {
Expand Down

0 comments on commit 0e140d1

Please sign in to comment.