diff --git a/.gradle/9.4.0/checksums/checksums.lock b/.gradle/9.4.0/checksums/checksums.lock index 5d4b56d..3163ffe 100644 Binary files a/.gradle/9.4.0/checksums/checksums.lock and b/.gradle/9.4.0/checksums/checksums.lock differ diff --git a/.gradle/9.4.0/checksums/md5-checksums.bin b/.gradle/9.4.0/checksums/md5-checksums.bin new file mode 100644 index 0000000..7859ad9 Binary files /dev/null and b/.gradle/9.4.0/checksums/md5-checksums.bin differ diff --git a/.gradle/9.4.0/checksums/sha1-checksums.bin b/.gradle/9.4.0/checksums/sha1-checksums.bin new file mode 100644 index 0000000..be730cf Binary files /dev/null and b/.gradle/9.4.0/checksums/sha1-checksums.bin differ diff --git a/.gradle/9.4.0/executionHistory/executionHistory.bin b/.gradle/9.4.0/executionHistory/executionHistory.bin index c23c100..c940550 100644 Binary files a/.gradle/9.4.0/executionHistory/executionHistory.bin and b/.gradle/9.4.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/9.4.0/executionHistory/executionHistory.lock b/.gradle/9.4.0/executionHistory/executionHistory.lock index 779f0c6..8de5e99 100644 Binary files a/.gradle/9.4.0/executionHistory/executionHistory.lock and b/.gradle/9.4.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/9.4.0/fileHashes/fileHashes.bin b/.gradle/9.4.0/fileHashes/fileHashes.bin index dd7822a..fc3de1c 100644 Binary files a/.gradle/9.4.0/fileHashes/fileHashes.bin and b/.gradle/9.4.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/9.4.0/fileHashes/fileHashes.lock b/.gradle/9.4.0/fileHashes/fileHashes.lock index 0110dae..9ed3ffb 100644 Binary files a/.gradle/9.4.0/fileHashes/fileHashes.lock and b/.gradle/9.4.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/9.4.0/fileHashes/resourceHashesCache.bin b/.gradle/9.4.0/fileHashes/resourceHashesCache.bin index d0915fc..25c79d3 100644 Binary files a/.gradle/9.4.0/fileHashes/resourceHashesCache.bin and b/.gradle/9.4.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index cbebc6a..a2e3359 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 82e434b..3da57f2 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 7895e5c..68b5968 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/dependencies.gradle b/dependencies.gradle index 2767713..80f19b3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,4 +1,9 @@ // Add your dependencies here dependencies { + compileOnlyApi('mods.flammpfeil.slashblade:SlashBlade:1.0.0-stub') +} + +repositories { + mavenLocal() } diff --git a/run/natives/lwjgl2/OpenAL32.dll b/run/natives/lwjgl2/OpenAL32.dll new file mode 100644 index 0000000..1f69e94 Binary files /dev/null and b/run/natives/lwjgl2/OpenAL32.dll differ diff --git a/run/natives/lwjgl2/OpenAL64.dll b/run/natives/lwjgl2/OpenAL64.dll new file mode 100644 index 0000000..6f2a2fe Binary files /dev/null and b/run/natives/lwjgl2/OpenAL64.dll differ diff --git a/run/natives/lwjgl2/avutil-ttv-51.dll b/run/natives/lwjgl2/avutil-ttv-51.dll new file mode 100644 index 0000000..fc9a3a5 Binary files /dev/null and b/run/natives/lwjgl2/avutil-ttv-51.dll differ diff --git a/run/natives/lwjgl2/jinput-dx8.dll b/run/natives/lwjgl2/jinput-dx8.dll new file mode 100644 index 0000000..bf3fe90 Binary files /dev/null and b/run/natives/lwjgl2/jinput-dx8.dll differ diff --git a/run/natives/lwjgl2/jinput-dx8_64.dll b/run/natives/lwjgl2/jinput-dx8_64.dll new file mode 100644 index 0000000..a56d9a7 Binary files /dev/null and b/run/natives/lwjgl2/jinput-dx8_64.dll differ diff --git a/run/natives/lwjgl2/jinput-raw.dll b/run/natives/lwjgl2/jinput-raw.dll new file mode 100644 index 0000000..1131d47 Binary files /dev/null and b/run/natives/lwjgl2/jinput-raw.dll differ diff --git a/run/natives/lwjgl2/jinput-raw_64.dll b/run/natives/lwjgl2/jinput-raw_64.dll new file mode 100644 index 0000000..38e1c10 Binary files /dev/null and b/run/natives/lwjgl2/jinput-raw_64.dll differ diff --git a/run/natives/lwjgl2/jinput-wintab.dll b/run/natives/lwjgl2/jinput-wintab.dll new file mode 100644 index 0000000..e075ec3 Binary files /dev/null and b/run/natives/lwjgl2/jinput-wintab.dll differ diff --git a/run/natives/lwjgl2/libjinput-linux.so b/run/natives/lwjgl2/libjinput-linux.so new file mode 100644 index 0000000..dba9e59 Binary files /dev/null and b/run/natives/lwjgl2/libjinput-linux.so differ diff --git a/run/natives/lwjgl2/libjinput-linux64.so b/run/natives/lwjgl2/libjinput-linux64.so new file mode 100644 index 0000000..8b5f9d8 Binary files /dev/null and b/run/natives/lwjgl2/libjinput-linux64.so differ diff --git a/run/natives/lwjgl2/libjinput-osx.jnilib b/run/natives/lwjgl2/libjinput-osx.jnilib new file mode 100644 index 0000000..59a3eab Binary files /dev/null and b/run/natives/lwjgl2/libjinput-osx.jnilib differ diff --git a/run/natives/lwjgl2/libmfxsw64.dll b/run/natives/lwjgl2/libmfxsw64.dll new file mode 100644 index 0000000..8314f02 Binary files /dev/null and b/run/natives/lwjgl2/libmfxsw64.dll differ diff --git a/run/natives/lwjgl2/libmp3lame-ttv.dll b/run/natives/lwjgl2/libmp3lame-ttv.dll new file mode 100644 index 0000000..803ad5a Binary files /dev/null and b/run/natives/lwjgl2/libmp3lame-ttv.dll differ diff --git a/run/natives/lwjgl2/lwjgl.dll b/run/natives/lwjgl2/lwjgl.dll new file mode 100644 index 0000000..6e9b49d Binary files /dev/null and b/run/natives/lwjgl2/lwjgl.dll differ diff --git a/run/natives/lwjgl2/lwjgl64.dll b/run/natives/lwjgl2/lwjgl64.dll new file mode 100644 index 0000000..3c9b8e9 Binary files /dev/null and b/run/natives/lwjgl2/lwjgl64.dll differ diff --git a/run/natives/lwjgl2/swresample-ttv-0.dll b/run/natives/lwjgl2/swresample-ttv-0.dll new file mode 100644 index 0000000..a7729c1 Binary files /dev/null and b/run/natives/lwjgl2/swresample-ttv-0.dll differ diff --git a/run/natives/lwjgl2/twitchsdk.dll b/run/natives/lwjgl2/twitchsdk.dll new file mode 100644 index 0000000..f21d426 Binary files /dev/null and b/run/natives/lwjgl2/twitchsdk.dll differ diff --git a/src/main/java/mods/flammpfeil/toyako/Toyako.java b/src/main/java/mods/flammpfeil/toyako/Toyako.java index 4e4806f..ba2168b 100644 --- a/src/main/java/mods/flammpfeil/toyako/Toyako.java +++ b/src/main/java/mods/flammpfeil/toyako/Toyako.java @@ -13,6 +13,7 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import mods.flammpfeil.slashblade.SlashBlade; import mods.flammpfeil.toyako.named.ToyakoBokutou; +import net.minecraftforge.common.MinecraftForge; @Mod(name="toyako", modid="flammpfeil.toyako", version="mc1.7.2-r1") public class Toyako { @@ -22,7 +23,7 @@ public class Toyako { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { - SlashBlade.InitEventBus.register((Object)new ToyakoBokutou()); + MinecraftForge.EVENT_BUS.register((Object)new ToyakoBokutou()); } } diff --git a/src/main/java/mods/flammpfeil/toyako/named/ToyakoBokutou.java b/src/main/java/mods/flammpfeil/toyako/named/ToyakoBokutou.java index 9b596bf..b687950 100644 --- a/src/main/java/mods/flammpfeil/toyako/named/ToyakoBokutou.java +++ b/src/main/java/mods/flammpfeil/toyako/named/ToyakoBokutou.java @@ -44,12 +44,12 @@ implements VillagerRegistry.IVillageTradeHandler { @SubscribeEvent public void init(LoadEvent.InitEvent event) { - ItemStack customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + ItemStack customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); NBTTagCompound tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.writeToNBT(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, this.name); ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(70)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)(4.0f + Item.ToolMaterial.STONE.func_78000_c())); + ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)(4.0f + Item.ToolMaterial.STONE.getDamageVsEntity())); ItemSlashBlade.TextureName.set(tag, "named/toyako/toyako"); ItemSlashBlade.ModelName.set(tag, "named/toyako/toyako"); ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(4)); @@ -64,9 +64,9 @@ implements VillagerRegistry.IVillageTradeHandler { } public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - if (villager.func_70946_n() == 3) { - ItemStack blade = SlashBlade.getCustomBlade((String)"flammpfeil.slashblade", (String)this.name); - recipeList.add((Object)new MerchantRecipe(new ItemStack(Items.field_151166_bC, 3 + random.nextInt(5)), blade)); + if (villager.getProfession() == 3) { + ItemStack blade = (ItemStack)SlashBlade.getCustomBlade((String)"flammpfeil.slashblade", (String)this.name); + recipeList.add((Object)new MerchantRecipe(new ItemStack(Items.emerald, 3 + random.nextInt(5)), blade)); } } } diff --git a/test.gradle b/test.gradle deleted file mode 100644 index e1cfac8..0000000 --- a/test.gradle +++ /dev/null @@ -1,19 +0,0 @@ -pluginManagement { - repositories { - maven { - name "GTNH Maven" - url "https://nexus.gtnewhorizons.com/repository/public/" - mavenContent { - includeGroup("com.gtnewhorizons") - includeGroupByRegex("com\.gtnewhorizons\..+") - } - } - gradlePluginPortal() - mavenCentral() - mavenLocal() - } -} - -plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' -}