MF2 7 New Weapons, Metallurgy Support etc.

.gitignore

@@ -1,80 +1,82 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# =========================
-# MCP Files
-# =========================
-.classpath
-.gradle/2.0/taskArtifacts/cache.properties
-.gradle/2.0/taskArtifacts/cache.properties.lock
-*.bin
-.gradle/gradle.log
+### Windows ###
+
+thumbs.db
+*.db
+
+### Java ###
+
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.txt
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Eclipse ###
+
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+/eclipse
+/run
+
+# Eclipse Core
 .project
-.settings/org.eclipse.jdt.core.prefs
-CREDITS-fml.txt
-*.location
-eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
-eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
-eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
-*.prefs
-eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
 *.launch
-eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
-*.jar
-forge-1.8-11.14.0.1299-changelog.txt
-README.txt
-MinecraftForge-License.txt
-MinecraftForge-Credits.txt
-gradlew
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+### Intellij IDEA ###
+
+*.iml
+*.ipr
+*.iws
+
+.idea/
+.idea_modules/
+classes/
+
+/out/
 gradle/wrapper/gradle-wrapper.properties
-*.bat
-LICENSE-fml.txt
-forge-1.7.10-10.13.2.1230-changelog.txt
-bin/*
-eclipse/*
-/bin/
+gradlew
+gradlew.bat
+
+# Linux
+*~

.travis.yml

@@ -0,0 +1,34 @@
+sudo: required
+dist: trusty
+
+language: java
+jdk: oraclejdk8
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+before_install: chmod +x gradlew
+install:
+  - ./gradlew setupCIWorkspace -S
+script:
+  - ./gradlew build
+
+deploy:
+  provider: releases
+  api_key:
+    secure: "eAH5VmzD1reEhytSz4vx37IehXfG4IiV3QAEGBvK0xCN3OW/9se6U80t/ymIOKpsxvSlTyuOF/yJ4Q6+VsUl0SjFhu93k3lgoO2iT39NIvnAR6R/cN+vWGUX7kjKV6+h1n71vFV6ok4k8GXqPNDits6DMg97j5lX0w5IUDzoCkz8sTE5ScmJFoMeG+jlETnSsmvkwZabdkta+KzpYDolzAHQ5VbBb0/gu9rSF56fxyXySs8D441eSY0Gc2vl5VC0pHVW0jlfXiGo+Njsb0SuGR2bqbIj122X6dk1rH1u2rYml7QW+jA3MWpPk8CRuRlI2yMnlf4yLRfIgnwa5PLOakici5vAlIvufHaEn16QOc1SpNO/LHRWvAtDCoUJARMrnjaWqGOguuEvhqoXEvl8OfX4CCwoaHGJ5O826G6qS8BjQbfxT6Ew8LZZzWqDhHPVfu3ySDquGNdXRrq8z3cKPkkg8ApLzPBaxDG0nf3AQDSxB/0wnYRZYKmii2wsWSbyC6AqaI1l24pocsCMV2hL1MBtouNl3nheTwfBaEbxVC/CzrTfSlGO0tyD+6oRRH9mRX+ZAWl+Evua7OmVNeVBZhbYVeInJGfwzjjAqCgbumOMcHqomkevEaCWqDU3wjExNL5USlwEh22yq9+uwAZDbio8UcgViMiFWkAIdwLEOMg="
+  file_glob: true
+  file: $HOME/build/libs/*
+  skip_cleanup: true
+  on:
+    tags: true
+
+notifications:
+  email: false

README.md

@@ -1,2 +1,11 @@
-# MineFantasy2 (2.6.10+)
-Try keep it neat
+# MineFantasy2 Unofficial [![Travis CI](https://travis-ci.org/Sirse/MineFantasyII-Cont.svg?branch=master)](https://travis-ci.org/Sirse/MineFantasyII-Cont) [![CurseForge](http://cf.way2muchnoise.eu/minefantasy2.svg)](https://minecraft.curseforge.com/projects/minefantasy2) 
+
+Unofficial, but approved MineFantasy 2 fork aimed for cross-mod integration, bug fixes, stability and perfomance tweaks.
+
+### Useful links:
+
+- Join a discussion at [our Minecraft forum thread](https://minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-mods/wip-mods/2467203-minefantasy2-alpha)
+- Downloads are avaliable on [releases page](https://github.com/Sirse/MineFantasyII-Cont/releases)
+- Feedback are needed! If you found an issue, please, [report it!](https://github.com/Sirse/MineFantasyII-Cont/issues)
+
+#### Also, you are can support MineFantasy II Unofficial developing [via donation!](https://www.paypal.me/sirse)

TODO/Dwarvenforged/DwarvenForgedStyle.java

@@ -0,0 +1,79 @@
+package minefantasy.mf2.item.list.styles;
+
+import minefantasy.mf2.api.armour.ArmourDesign;
+import minefantasy.mf2.api.crafting.exotic.SpecialForging;
+import minefantasy.mf2.item.archery.EnumBowType;
+import minefantasy.mf2.item.archery.ItemBowMF;
+import minefantasy.mf2.item.armour.ItemCustomArmour;
+import minefantasy.mf2.item.list.CreativeTabMF;
+import minefantasy.mf2.item.list.CustomArmourListMF;
+import minefantasy.mf2.item.list.CustomToolListMF;
+import minefantasy.mf2.item.tool.ItemAxeMF;
+import minefantasy.mf2.item.tool.ItemHoeMF;
+import minefantasy.mf2.item.tool.ItemPickMF;
+import minefantasy.mf2.item.tool.ItemShearsMF;
+import minefantasy.mf2.item.tool.ItemSpadeMF;
+import minefantasy.mf2.item.tool.advanced.ItemHandpick;
+import minefantasy.mf2.item.tool.advanced.ItemHvyPick;
+import minefantasy.mf2.item.tool.advanced.ItemHvyShovel;
+import minefantasy.mf2.item.tool.advanced.ItemLumberAxe;
+import minefantasy.mf2.item.tool.advanced.ItemMattock;
+import minefantasy.mf2.item.tool.advanced.ItemScythe;
+import minefantasy.mf2.item.tool.advanced.ItemTrowMF;
+import minefantasy.mf2.item.tool.crafting.ItemHammer;
+import minefantasy.mf2.item.tool.crafting.ItemKnifeMF;
+import minefantasy.mf2.item.tool.crafting.ItemNeedle;
+import minefantasy.mf2.item.tool.crafting.ItemSaw;
+import minefantasy.mf2.item.tool.crafting.ItemSpanner;
+import minefantasy.mf2.item.tool.crafting.ItemTongs;
+import minefantasy.mf2.item.weapon.ItemBattleaxeMF;
+import minefantasy.mf2.item.weapon.ItemDagger;
+import minefantasy.mf2.item.weapon.ItemGreatswordMF;
+import minefantasy.mf2.item.weapon.ItemHalbeardMF;
+import minefantasy.mf2.item.weapon.ItemKatanaMF;
+import minefantasy.mf2.item.weapon.ItemLance;
+import minefantasy.mf2.item.weapon.ItemMaceMF;
+import minefantasy.mf2.item.weapon.ItemSpearMF;
+import minefantasy.mf2.item.weapon.ItemSwordMF;
+import minefantasy.mf2.item.weapon.ItemWaraxeMF;
+import minefantasy.mf2.item.weapon.ItemWarhammerMF;
+import minefantasy.mf2.item.weapon.ItemWeaponMF;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item.ToolMaterial;
+import net.minecraftforge.common.util.EnumHelper;
+
+public class DwarvenForgedStyle {
+    public static ToolMaterial dwarvenforged = EnumHelper.addToolMaterial("dwarvenforged", 2, 225, 5.5F, 1.5F, 12);
+
+    public static ItemWeaponMF dwarvenforged_longsword;
+
+    public static ItemPickMF dwarvenforged_pick;
+
+
+
+
+    public static void load() {
+        String design = "dwarvenforged";
+        CreativeTabs tab = CreativeTabMF.tabDwarvenforged;
+        ToolMaterial mat = dwarvenforged;
+        float ratingMod = 1.2F;
+
+
+        dwarvenforged_longsword = new ItemSwordMF(design + "_longsword", mat, 0, 1F).setCustom(design).setTab(tab)
+                .modifyBaseDamage(1);
+
+
+        // Tools
+        dwarvenforged_pick = (ItemPickMF) new ItemPickMF(design + "_pick", mat, 0).setCustom(design).setCreativeTab(tab);
+
+
+        // Crafters
+
+
+
+    }
+
+    public static void loadCrafting() {
+
+    }
+}