From cecee9835d28d7d15c6e7245693f54f97f24250b Mon Sep 17 00:00:00 2001 From: FreneticFeline Date: Sat, 6 Jan 2018 22:36:42 -0500 Subject: [PATCH] backport v1.7 to MC 1.9 --- build.gradle | 8 ++++---- .../unladenswallow/minecraft/autofish/ModAutoFish.java | 2 +- .../minecraft/autofish/events/EventListener.java | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index c3e4bd8..3bfdfec 100644 --- a/build.gradle +++ b/build.gradle @@ -4,18 +4,18 @@ buildscript { maven { url = "http://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "1.10-1.7" +version = "1.9-1.7" group= "net.unladenswallow.minecraft.autofish" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "mod_autofish_forge" minecraft { - version = "1.10.2-12.18.3.2185" + version = "12.16.1.1887" runDir = "eclipse" // the mappings can be changed at any time, and must be in the following format. @@ -23,7 +23,7 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not allways work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20160518" + mappings = "snapshot_20160312" } dependencies { diff --git a/src/main/java/net/unladenswallow/minecraft/autofish/ModAutoFish.java b/src/main/java/net/unladenswallow/minecraft/autofish/ModAutoFish.java index 942fe6d..7942f9e 100644 --- a/src/main/java/net/unladenswallow/minecraft/autofish/ModAutoFish.java +++ b/src/main/java/net/unladenswallow/minecraft/autofish/ModAutoFish.java @@ -14,7 +14,7 @@ import net.unladenswallow.minecraft.autofish.proxy.CommonProxy; import net.unladenswallow.minecraft.autofish.util.Logger; -@Mod(modid = ModAutoFish.MODID, useMetadata = true, acceptedMinecraftVersions="[1.10,1.11)", acceptableRemoteVersions="[1.10,1.11)", +@Mod(modid = ModAutoFish.MODID, useMetadata = true, acceptedMinecraftVersions="[1.9,1.10)", acceptableRemoteVersions="[1.9,1.10)", guiFactory = "net.unladenswallow.minecraft.autofish.gui.GuiFactory") public class ModAutoFish { public static final String MODID = "mod_autofish"; diff --git a/src/main/java/net/unladenswallow/minecraft/autofish/events/EventListener.java b/src/main/java/net/unladenswallow/minecraft/autofish/events/EventListener.java index d37d200..0475a76 100644 --- a/src/main/java/net/unladenswallow/minecraft/autofish/events/EventListener.java +++ b/src/main/java/net/unladenswallow/minecraft/autofish/events/EventListener.java @@ -74,7 +74,7 @@ public void onServerTickEvent(ServerTickEvent event) { */ @SubscribeEvent public void onPlaySoundEvent(PlaySoundEvent event) { - if (ModAutoFish.config_autofish_enable && SoundEvents.ENTITY_BOBBER_SPLASH.getSoundName() == event.getSound().getSoundLocation()) { + if (ModAutoFish.config_autofish_enable && SoundEvents.entity_bobber_splash.getSoundName() == event.getSound().getSoundLocation()) { _autoFish.onBobberSplashDetected(event.getSound().getXPosF(), event.getSound().getYPosF(), event.getSound().getZPosF()); } } @@ -167,8 +167,9 @@ public void onEntityRemoved(Entity entityIn) {} public void broadcastSound(int soundID, BlockPos pos, int data) {} @Override - public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {} + public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {} + @Override - public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {} + public void playAuxSFX(EntityPlayer player, int sfxType, BlockPos blockPosIn, int data) {} }