This is an error PR, please disregard

build.gradle

@@ -2,15 +2,17 @@ buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
         maven { url 'https://plugins.gradle.org/m2/' }
-        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }		   			
+        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url = 'https://dist.creeper.host/Sponge/maven' }
         jcenter()
         mavenCentral()
 
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
         classpath 'com.google.code.gson:gson:2.8.5'
-        classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'		
+        classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
@@ -38,7 +40,7 @@ minecraft {
     runs {
         client {
             workingDirectory project.file('run')
-			ideaModule = "${project.name}.main"
+            ideaModule = "${project.name}.main"
             //property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -50,7 +52,7 @@ minecraft {
 
         server {
             workingDirectory project.file('run')
-			ideaModule = "${project.name}.main"
+            ideaModule = "${project.name}.main"
             //property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -60,7 +62,7 @@ minecraft {
             }
         }
 
-		intellijClient { // run this in debug so hotswap doesnt randomly fail
+        intellijClient { // run this in debug so hotswap doesnt randomly fail
             parent runs.client
 
             ideaModule "${project.name}.main"
@@ -75,16 +77,16 @@ minecraft {
             //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSARCONFIG'
 
             // Recommended logging level for the console
-            //property 'forge.logging.console.level', 'debug'           
-          
+            //property 'forge.logging.console.level', 'debug'
+
             mods {
                 mmorpg {
                     source sourceSets.main
                 }
             }
-			
-			  args '--mod', 'mmorpg', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources')
-			
+
+            args '--mod', 'mmorpg', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources')
+
         }
     }
 }
@@ -105,13 +107,13 @@ repositories {
         name = "jitpack"
         url "https://jitpack.io"
     }
-
-	maven { url "https://maven.tterrag.com/" }
 
-    //maven { url = "https://maven2.tterrag.com" } // AutoSave	
-
-    maven { url = "https://maven.theillusivec4.top/" } // curios  	
-
+    maven { url "https://maven.tterrag.com/" }
+
+    //maven { url = "https://maven2.tterrag.com" } // AutoSave
+
+    maven { url = "https://maven.theillusivec4.top/" } // curios
+
     maven {
         name = "CurseForge"
         url = "https://minecraft.curseforge.com/api/maven/"
@@ -133,8 +135,9 @@ dependencies {
     minecraft "net.minecraftforge:forge:${version_forge}"
 
     compile fg.deobf("top.theillusivec4.curios:curios:${version_curios}") // Trinkets, REQUIRED
-    compile 'com.google.code.gson:gson:2.8.5' // Serialize More Difficult Configs, REQUIRED	
-
+    compile 'com.google.code.gson:gson:2.8.5' // Serialize More Difficult Configs, REQUIRED
+    compile 'org.spongepowered:mixin:0.8.1-SNAPSHOT'
+
 }
 
 
@@ -152,8 +155,10 @@ jar {
                     "Specification-Version"   : "${version}",
                     "Implementation-Title"    : "${mod_name}",
                     "Implementation-Version"  : "${version}",
-                    "Implementation-Vendor"   : "${mod_author}",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
+                    "Implementation-Vendor"   : "${mod_author}",                   
+                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+					"MixinConnector"          : "com.robertx22.mine_and_slash.mmorpg.MixinConnector",
+					],)
     }
 
 
@@ -184,6 +189,24 @@ curseforge {
         changelogType = 'text'
         changelog = file('CHANGELOG.txt')
         addGameVersion("Forge")
-        relations(myCurseRelatons)      
+        relations(myCurseRelatons)
     }
-}
+}
+
+repositories {
+    maven { url = 'https://files.minecraftforge.net/maven' }
+    jcenter()
+    mavenCentral()
+    maven { url = 'https://dist.creeper.host/Sponge/maven' }    
+
+    flatDir {
+        dirs 'deps'
+    }
+
+}
+
+apply plugin: 'org.spongepowered.mixin'
+
+mixin {
+    add sourceSets.main, "mmorpg.refmap.json"
+}

changelog.txt

@@ -1,119 +1,49 @@
-3.6.15
-* map portals now take less time to break
-* dmg numbers now show all elements 
-* changed hud render to not break if experience isn't rendered.
-* small perf improvement for auto config items
-* most spells now swing arm
-* fix entity configs not clamping correctly if dimension is set to scale mob lvl to player
-* fix imbue synergy not giving hunter stacks
-* added minion mob rarity (for boss summons so they dont drop loot)
-* fixed the "Tried to load a block entity for block Block{minecraft:air}" spam
-* fix skill damage stats not working (this sounds really dumb but i forgot to make them work differently after reworking the spell system, leaving them as dummy stats,
-it doesn't help that i didn't have time to play test my mod)
-* strength now increases elemental attack damage instead of all ele dmg, intelligence same but increases all elemental spell damage.
-
-3.6.14
-* fix divine buffs expiring randomly after a few seconds
-
-3.6.13
-* dungeon chests now have a chance to give vanilla items that are dictated by lootables. (meaning configurable by modpack devs)
-Low lvl maps give stuff like coal, mid lvl give gold, and high lvl maps can give even diamonds!
-* fixed more dungeon signs
-* fix stations dupe bug
-
-3.6.12
-* implemented an experimental simple way to minimize effectiveness of mob farms (ill implement configs later, first i need to see if it works)
-
-3.6.11
-* should fix mana cost reduction throwing exception on synergies that dont cost mana.
-
-3.6.10
-* starter item config is now common config
-
-3.6.9
-* trying out performance optimizations
-* added ignored entities config, this stops stat data packets from being sent to client,
- should make servers less laggy as most entities are bats and fish, and you don't really care about their stats. 
- You could also add sheep for example, if you have a huge sheep farm that's laggy.
- * orb of blessing can no longer reroll unique gear's stats
- * orb of unique blessing can now only reroll them, and the instability hit is now much higher (as unique gears are much less random now, i'm toning down the amount of times you can modify them)
-* made starter items a newbie gear bag instead. the bag now gives same items every time. 
-
-3.6.8
-* updated chinese lang
-* added mastery descriptions by dreckz
-* added 3 new divine buff spells
-* removed some advancements
-
-3.6.7
-* added a new mastery: divine!
-* added new fire mastery synergy
-* removed deobf jar, seemed to confuse more non modders than it helped modders
-* pets shouldnt take spell damage from owners anymore
-
-3.6.6
-* removed experimental map drop rate restrictions
-* effective spell level is now derived from effective mastery level.
-* fix death message
-* fix spell cooldown being synced wrongly when in gui
-* should fix ores not generating in modded biomes
-
-3.6.5
-* fixed volcano doing only 1 hit
-* buffed thorn armor and hunter instinct stats
-
-3.6.4
-* should fix possible server crash
-
-3.6.3
-* should fix some spells not going on cooldown after casting
-3.6.2
-* fix entrance room 
-
-3.6.1
-* should fix mobs sometimes not doing dmg
-* fix effect stats scaling to player level instead of spell level
-
-3.6.0
-
-SPELL REWORK!
-* spell tree has been remade into masteries.
-* spells and synergies now have levels
-* synergies now cost mana
-* removed some spells as i consider them bad (like geyser) and others because their spell school doesn't have enough spells, they'll probably be re-added later
-* added some new spells
-* spell damage stats are now percents and increase spell damage by percent, instead of adding to the damage.
-* infusion reworked
-* added cooldown reduction, mana cost reduction and cast rate stats (they might not be used yet though, but they're there)
-* added +1 to spell school levels stat
-* removed elemental conversion and transfer stats, mostly useless after spell damage became a percent
-* huge easy aoe spells now have much larger cooldown, added other semi aoe spells that are harder to hit and can't hit that many enemies at once.
-* added a new rune that adds levels to specific spells, you'll need that for after level 45
-
-What should happen with the rework:
-* players should think more about how many points they want to spend and where
-* players should decide between base stats or spell levels
-* players should be able to play 2 schools of magic that use different elements without feeling useless
-* magic should be less op at endgame and more useful at early game.
-* aoe clearing a bunch of mobs should be much harder to do, especially from range, as high aoe spells are under long cooldown
-
-If the system didn't make some of these happen, please tell me about it.
-
-Other:
-* bosses now spawn less minions but they're all max rarity
-* blocking fully now stops attack knockbacks. can't figure out how to stop the attack sounds though
-* made vanilla teams usable for exp and friendly fire off.
-* casting spells now slows you down
-* server performance improvements (syncing mob stat packets to client should lag server less now as i almost cut down the packet size in half)
-* added all the buildathon rewards that people asked for (still many didn't come claim them though)
-* fixed unique cangetset field not doing anything in datapacks
-* mobs now have a small chance to increase their own rarity and level by killing other mobs. (experimental feature but i think it will be good)
-* decreased default regen hunger cost
-* made weapon costs scale with weapon level. This is experimental until i see if it can be abused or not. If people find some way of using lvl 1 weapons to do a lot of damage 
-then i'll have to switch back to scaling costs to player level.
-* spells levels now dictate their damage and mana costs too. To get maximum player level of spell effectiveness you'll need +1 to skill level gear stats. (5 or 6 of them)
-* added new affixes and runeword.
-* increase default stat points per lvl
-* as talents pic is no longer 3 mb, starting talents shouldnt freeze game anymore
-* potion of spell reset now gives 10 spell reset points instead of 1, but its a bit more expensive
-* added a lot more dungeon rooms by @Eclipse
+1.0
+
+Big compatibility changes:
+
+* Damage is no longer overrided except for item's with stats and my spells. This means other mod's gear and spells should ALL be compatible now!
+* There's no magical mine and slash hp anymore, instead your normal hearts are increased.
+* Stats scale much slower with levels, and if you want to nerf or buff how strong my mod is, just increase or decrease stat scaling or maximum level. Both work.
+* Vanilla armor is overrided for entity damage, but there's a config for effectiveness now.
+
+As a result, the mod should be a lot more modpack friendly while still easily allowing itself to be the main point of a modpack by just tweaking one or two config options.
+
+
+Big changes that required the rework:
+
+* Spells are now Skill Gems.
+* Talent tree is gone. 
+* Gear now has local and global stats, local stats are weapon damage, armor etc. 
+Think Path of exile 50 base armor + adds 20 to armor + 80% increased armor and the item totals it up.
+* Gear rarities trimmed, now Common, Magical, Rare and Unique. Common complaint was that "Legendary" gear was sometimes too weak for the name.
+New system doesn't have that issue, the rarity describes how rare it is now, not power level.
+
+Added features:
+* generated chests everywhere now have random loot in them
+* added many new stats like attack speed, magic find, bonus damage to burning enemies etc.
+
+To rework the mod, I needed an almost clean slate, and to trim a lot of content that I feel wasn't very successful (for the amount of effort it requires).
+Other things were removed because I wanted to remove them, but I couldn't because I'd ruin existing worlds (*cough* master bag)
+
+* removed all auto pickup bags except currency bag
+* removed auto salvage bag
+* removed charms and bracelets
+* removed map dimensions
+* removed runes and runewords
+* removed sets 
+* removed instability
+
+Some of these will probably come back, after a rework. Others are gone for good.
+
+Changed features:
+* dimension configs are now datapacks
+* entity configs are now datapacks
+* damage increases are now totalled up before being applied. (this resulted in some insane damage multiplication)
+* attack speed should work properly now
+* bows now dont do full damage anymore on short charges
+* changed hp regen to reduce saturation by % of total hp regenerated. This means more hp won't cost more saturation to regen.
+* made unique gear datapacks more powerful
+* gears now break on 0 durability
+* runes deleted, jewels used instead. Magic items can have sockets.
+* gui changed to more vanilla like. Capped hearts display to one row.