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

[BUG FIX & Update] Upgrade to M-UI 2.0.8-1.7.10 #3

Merged
merged 18 commits into from
Jan 24, 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
169 changes: 101 additions & 68 deletions build.gradle

Large diffs are not rendered by default.

32 changes: 1 addition & 31 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,7 @@
*/
dependencies {
compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
compileOnly "com.hbm:hbm:1.0.27:dev"
api("com.github.GTNewHorizons:ModularUI2:2.0.6-1.7.10:dev")
api("com.github.GTNewHorizons:ModularUI2:2.0.8-1.7.10:dev")
api "com.gregoriust.gregtech:gregtech_1.7.10:6.16.02:dev"
api 'com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev'
//compile(fileTree("libs/gregtech_1.7.10-6.16.02-dev.jar"))
//compileOnly "team.chisel.ctmlib:CTMLib:MC1.7.10-1.4.1.5:deobf"
//compileOnly "team.chisel:Chisel:2.9.5.12:deobf"
//compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
//compileOnly "maven.modrinth:baubles-expanded:2.1.4"
//compileOnly fileTree("libs/Techguns.beta.1.2_alphatest4.1.jar")
//api("com.github.GTNewHorizons:ModularUI2:2.0.6-1.7.10:dev"
compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
compileOnly "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"
compileOnly "ic2:IC2Classic:1.2.1.8:dev"

compileOnly "twilightforest:twilightforest:1.7.10-2.3.8dev:dev"
compileOnly "blusunrize:ImmersiveEngineering:0.7.7:deobf"
// api "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
// api "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
//api 'com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev'
// api "com.github.GTNewHorizons:NotEnoughItems:2.3.82-GTNH:dev"
// compile "curse.maven:techguns-244201:2429662"


// compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
// compileOnly "ic2:IC2Classic:1.2.1.8:dev"
// compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
// compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
// compileOnly "openblocks:OpenBlocks:1.7.10-1.6-1.7.10:deobf"
// compileOnly "openmods:OpenModsLib:1.7.10-0.10:deobf"
// compileOnly "vazkii.botania:Botania:r1.8-250:deobf"
// compileOnly "com.mod-buildcraft:buildcraft:7.1.23:dev"
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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=false

# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
Expand Down Expand Up @@ -105,6 +105,7 @@ curseForgeRelations =
# This should only be uncommented to keep it easier to sync with upstream/other forks.
# That is, if there is no other active fork/upstream, NEVER change this.
disableSpotless = true
disableCheckstyle=true

# Override the IDEA build type. Valid value is "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
# (force use delegated build).
Expand Down
Binary file removed libs/Techguns.beta.1.2_alphatest4.1.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions src/main/java/bioast/mods/gt6scan/ScannerMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import bioast.mods.gt6scan.item.ScannerBehavior;
import bioast.mods.gt6scan.item.ScannerMultiTool;
import bioast.mods.gt6scan.network.ScanCommand;
import bioast.mods.gt6scan.proxy.CommonProxy;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
Expand All @@ -11,15 +12,14 @@
import gregapi.config.Config;
import gregapi.data.CS;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import static bioast.mods.gt6scan.ScannerMod.*;

@Mod(modid = MODID, version = VERSION, name = MODNAME,dependencies = DEPENDENCIES)
public class ScannerMod extends Abstract_Mod {
public static final String DEPENDENCIES = "required-after:modularui@[2.0.6,);after:gregapi";
public static final String DEPENDENCIES = "after:modularui@[2.0.8-1.7.10];required-after:gregapi";
public static final String MODID = "GRADLETOKEN_MODID";
public static final String MODNAME = "GRADLETOKEN_MODNAME";
public static final String VERSION = "GRADLETOKEN_VERSION";
Expand Down Expand Up @@ -70,6 +70,7 @@ public final void onPostLoad(cpw.mods.fml.common.event.FMLPostInitializationEven

@cpw.mods.fml.common.Mod.EventHandler
public final void onServerStarting(cpw.mods.fml.common.event.FMLServerStartingEvent aEvent) {
aEvent.registerServerCommand(new ScanCommand());
onModServerStarting(aEvent);
}

Expand Down
Loading