From 6cc31a9422d26603142ce2708cf3f8273854c04e Mon Sep 17 00:00:00 2001 From: Babbaj Date: Wed, 25 Mar 2020 20:23:41 -0400 Subject: [PATCH] update mods.toml and fix modid --- build.gradle | 5 +---- .../launch/mixins/MixinLivingEntity.java | 1 - .../launch/mixins/MixinMinecraft.java | 1 - src/launch/resources/META-INF/mods.toml | 20 +++++++----------- .../baritone/launch/BaritoneForgeModXD.class | Bin 414 -> 412 bytes src/launch/resources/pack.mcmeta | 6 ++++++ 6 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 src/launch/resources/pack.mcmeta diff --git a/build.gradle b/build.gradle index d7a9de4f0..fe4a22794 100755 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,6 @@ minecraft { mappings channel: 'snapshot', version: '20200213-1.15.1' if (getProject().hasProperty("baritone.forge_build")) { - println 'searge mappings!!' reobfMappings 'searge' } else { reobfMappings 'notch' @@ -154,7 +153,6 @@ dependencies { } runtime launchCompile('org.ow2.asm:asm-debug-all:5.2') runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2') - //"org.spongepowered:mixin:0.8.+" runtime launchCompile('org.spongepowered:mixin:0.8.+') { // Mixin includes a lot of dependencies that are too up-to-date exclude module: 'launchwrapper' @@ -220,12 +218,11 @@ task createSrgMc(type: RenameJarInPlace) { // fork setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE) - setJarTask('nword') + setJarTask('trans alaskan pipeline') } project.afterEvaluate { createSrgMc.dependsOn(extractSrg, copyMcJar) createSrgMc.setMappings(extractSrg.getOutput()) - //println(createSrgMc.getClasspath().getFiles()) } diff --git a/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java b/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java index 2790dda8a..026a23cfa 100644 --- a/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java +++ b/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java @@ -33,7 +33,6 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import static org.objectweb.asm.Opcodes.GETFIELD; -//import static org.spongepowered.asm.lib.Opcodes.GETFIELD; /** * @author Brady diff --git a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java index c137ec61f..53df678f8 100644 --- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java +++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java @@ -27,7 +27,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.world.ClientWorld; -//import org.spongepowered.asm.lib.Opcodes; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/launch/resources/META-INF/mods.toml b/src/launch/resources/META-INF/mods.toml index 7da9c21d6..2e788f382 100644 --- a/src/launch/resources/META-INF/mods.toml +++ b/src/launch/resources/META-INF/mods.toml @@ -8,29 +8,25 @@ modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # A URL to refer people to when problems occur with this mod -issueTrackerURL="http://my.issue.tracker/" #optional +issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="baritbone" #mandatory +modId="baritoe" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it version="${file.jarVersion}" #mandatory # A display name for the mod -displayName="Example Mod" #mandatory +displayName="Baritone" #mandatory # A URL for the "homepage" for this mod, displayed in the mod UI -displayURL="http://example.com/" #optional +displayURL="https://github.com/cabaletta/baritone" #optional # A file name (in the root of the mod JAR) containing a logo for display -logoFile="examplemod.png" #optional +#logoFile="examplemod.png" #optional # A text field displayed in the mod UI -credits="Thanks for this example mod goes to Java" #optional +credits="Hat Gamers" #optional # A text field displayed in the mod UI -authors="Love, Cheese and small house plants" #optional +authors="leijurv, Brady" #optional # The description text for the mod (multi line!) (#mandatory) description=''' -This is a long form description of the mod. You can write whatever you want here - -Have some lorem ipsum. - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. +A Minecraft pathfinder bot. ''' diff --git a/src/launch/resources/baritone/launch/BaritoneForgeModXD.class b/src/launch/resources/baritone/launch/BaritoneForgeModXD.class index d97e9e052d389464addb3706322f506ad6d5b240..cfb3137e28463732febb321bc6d1462d94b56cbd 100644 GIT binary patch delta 18 ZcmbQoJcoJ0BzE?s#G=fS{Ef4j838tx#G=fSr2M>%Gnp9yO4$b# diff --git a/src/launch/resources/pack.mcmeta b/src/launch/resources/pack.mcmeta new file mode 100644 index 000000000..1bc616027 --- /dev/null +++ b/src/launch/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "baritoe", + "pack_format": 5 + } +}