Merge branch '1.16'

Direwolf20-MC · Apr 17, 2021 · 3a0db5c · 3a0db5c
2 parents aca4161 + 3a1373c
commit 3a0db5c
Show file tree

Hide file tree

Showing 34 changed files with 1,322 additions and 717 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,69 +1,129 @@
 # Mining Gadgets Changelog
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## 1.16.5
+
+### [1.7.5] - 2021-04-17
+
+## Added
+
+- All new and amazing textures for the gadgets, modification table, and upgrades courtesy of the one and
+  only [Ridanisaurus Rid](https://github.com/Ridanisaurus)
+- All new laser gadgets models! They're all amazing and yes, *they're* you now have 3 amazing lasers to pick from!
+- A new and fancy Modification table
+    - You can hold shift whilst looking at the table to see what upgrades are on a gadget! It's super nice
+    - We've also added a super fancy render of the laser on the outside of the block. You'll see what I'm talking
+      about...
+
+### Changed
+
+- Changed the strength of the `render block` to stop players being able to hit the block and void its
+  drops. [#130](https://github.com/Direwolf20-MC/MiningGadgets/issues/130)
+- Modified the gadgets recipes slightly to allow for multiple lasers.
+
+### Fixed
+
+- Added blocking area on JEI to stop the modification gadgets slot overlapping a deletion area when in cheat
+  mode. [#142](https://github.com/Direwolf20-MC/MiningGadgets/issues/142)
+- Fixed a checking error allowing the freezing mode to replace waterlogged blocks... We now remove its water logged
+  state as long as it's not a tile entity. [#139](https://github.com/Direwolf20-MC/MiningGadgets/issues/139)
+- Fixed an issue where you could delete upgrades if you attempted to place a different tier of an upgrade into the
+  modification table. [#137](https://github.com/Direwolf20-MC/MiningGadgets/issues/137)
+
 ## 1.16.4
+
 ### [1.7.1] - 2020-11-23
 
 #### Changed
-- Removed Paver upgrade as it was half done, it'll be re-added later on [#119](https://github.com/Direwolf20-MC/MiningGadgets/issues/119)
+
+- Removed Paver upgrade as it was half done, it'll be re-added later
+  on [#119](https://github.com/Direwolf20-MC/MiningGadgets/issues/119)
 
 #### Fixed
-- Fixed crashing when another mod blocks our render block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
-- Added bypass to right click event to allow mining redstone when close [#114](https://github.com/Direwolf20-MC/MiningGadgets/issues/114)
-- Fixed a client crashing when scrolling on an un-upgraded gadgets settings screen [#113](https://github.com/Direwolf20-MC/MiningGadgets/issues/113)
-- Fixed a compatibility issue with IE when right clicking to charge the gadget [#105](https://github.com/Direwolf20-MC/MiningGadgets/issues/105)
-- Finally fixed the issue with 'invalid key' on custom button binds [#108](https://github.com/Direwolf20-MC/MiningGadgets/issues/108) [#101](https://github.com/Direwolf20-MC/MiningGadgets/issues/101)
-- Fixed a lot of issues related to the filter screen voiding blocks, messing with sorter mods and more. [#123](https://github.com/Direwolf20-MC/MiningGadgets/issues/123)
+
+- Fixed crashing when another mod blocks our render
+  block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
+- Added bypass to right click event to allow mining redstone when
+  close [#114](https://github.com/Direwolf20-MC/MiningGadgets/issues/114)
+- Fixed a client crashing when scrolling on an un-upgraded gadgets settings
+  screen [#113](https://github.com/Direwolf20-MC/MiningGadgets/issues/113)
+- Fixed a compatibility issue with IE when right clicking to charge the
+  gadget [#105](https://github.com/Direwolf20-MC/MiningGadgets/issues/105)
+- Finally fixed the issue with 'invalid key' on custom button
+  binds [#108](https://github.com/Direwolf20-MC/MiningGadgets/issues/108) [#101](https://github.com/Direwolf20-MC/MiningGadgets/issues/101)
+- Fixed a lot of issues related to the filter screen voiding blocks, messing with sorter mods and
+  more. [#123](https://github.com/Direwolf20-MC/MiningGadgets/issues/123)
 
 ## [1.7.0] - 2020-11-14
+
 - Updated to 1.6.4
 
 ## 1.16.3
+
 ### [1.6.0] - 2020-09-12
+
 > note: Lots has been ported up from `1.16.1` since our first `1.16.2 ` release see:
 > https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#142---2020-09-12 and
 > https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#141---2020-08-21 for more info
 
 #### Changed
+
 - Ported to 1.16.3
 
 ## 1.16.2
+
 ### [1.5.1] - 2020-09-12
+
 > note: Lots has been ported up from `1.16.1` since our first `1.16.2 ` release see:
 > https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#142---2020-09-12 and
 > https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#141---2020-08-21 for more info
 
 #### Changed
+
 - Re-ported to 1.16.2... :+1:
 
 ### [1.5.0] - 2020-08-14
 
 #### Changed
+
 - Updated to 1.16 :+1:
 
 ## 1.16.1
+
 ### [1.4.2] - 2020-09-12
+
 #### Added
+
 - A new render for when the Item is in your hand thanks to [ItsTheBdoge](https://github.com/ItsTheBdoge) :heart:
 - Added `hold shift` for full energy reading aka: `1M/1M FE` to `1,000,000/1,000,000 FE` It's nice! :D
 - Updated Modification table textures a bit
 
 #### Changed
-- You can now use right click on TileEntities with the Gadget in your hand again. The blocker on this operation has been modified to only apply to things you might have in your offhand like torches. It's not perfect, but the perfect option requires a PR to Forge...
+
+- You can now use right click on TileEntities with the Gadget in your hand again. The blocker on this operation has been
+  modified to only apply to things you might have in your offhand like torches. It's not perfect, but the perfect option
+  requires a PR to Forge...
 
 #### Fixed
-- Fixed the Mining Gadget going into negative energy due to a issue with freezing upgrade 
+
+- Fixed the Mining Gadget going into negative energy due to a issue with freezing upgrade
 
 ### [1.4.1] - 2020-08-21
+
 #### Added
-- Added a (disabled by default) key binding to open the Gadgets settings screen. (When enabled, it will disable the shift right click action)
+
+- Added a (disabled by default) key binding to open the Gadgets settings screen. (When enabled, it will disable the
+  shift right click action)
 - Added a Laser Beam preview to the Mining Gadget Visual Screen
-- Added `Paver` upgrade which will place cobble (cost of 10FE per block) to create a path as you mine to cover up any holes. It will not place above your player's height, and we plan on changing it from cobble :D 
+- Added `Paver` upgrade which will place cobble (cost of 10FE per block) to create a path as you mine to cover up any
+  holes. It will not place above your player's height, and we plan on changing it from cobble :D
 - Modification table can now have upgrades dropped into it's upgrade area (pick up and drop down)
 - Modification table now has an `empty state` to show helper text on how to use the table.
 - Modification table now has a title :eyes:
 
 #### Changed
+
 - Improved the look of the Mining Gadget Visual Screen
 - The modification table will now show the full tooltip for you upgrades
 - Bumped forge version
@@ -75,93 +135,131 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fixed laser rendering through walls when another player is using the gadget
 
 ### [1.4.0] - 2020-08-03
+
 #### Changed
+
 - Updated the mod to 1.16.1 :+1:
 
 ## 1.15.2
+
 ### [1.3.6] - 2020-11-26
+
 #### Fixed
-- Scrolling in the Mining Gadget menu crashing the game [#112](https://github.com/Direwolf20-MC/MiningGadgets/issues/112)
-- An issue where custom mouse buttons would crash the game [#92](https://github.com/Direwolf20-MC/MiningGadgets/issues/92)
+
+- Scrolling in the Mining Gadget menu crashing the
+  game [#112](https://github.com/Direwolf20-MC/MiningGadgets/issues/112)
+- An issue where custom mouse buttons would crash the
+  game [#92](https://github.com/Direwolf20-MC/MiningGadgets/issues/92)
 - Issues with the filter screen causing item voiding [#80](https://github.com/Direwolf20-MC/MiningGadgets/issues/80)
-- Fixed crashing when another mod blocks our render block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
-- Fixed crashing when another mod blocks our render block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
+- Fixed crashing when another mod blocks our render
+  block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
+- Fixed crashing when another mod blocks our render
+  block [#120](https://github.com/Direwolf20-MC/MiningGadgets/issues/120)
 
 ### [1.3.5] - 2020-03-29
+
 #### Added
+
 - Support for all (if they respect events) items that pick up items (dank storage, pocket storage, etc)
-- Added the `E` key as a way to get out the Mining Gadget shift-click screen 
-- Added support for both the Silk touch and Fortune upgrades to be applied to the same gadget but only one can be active at a time
+- Added the `E` key as a way to get out the Mining Gadget shift-click screen
+- Added support for both the Silk touch and Fortune upgrades to be applied to the same gadget but only one can be active
+  at a time
 - Added support for break ice blocks and placing water back in it's place (like vanilla does)
 - Added support for spawning additional drops (silver fish and others)
-- Added the ability to reduce freeze particles by adding a slight delay per tick (configurable in the gadget menu) (You're welcome Soaryn)
+- Added the ability to reduce freeze particles by adding a slight delay per tick (configurable in the gadget menu) (
+  You're welcome Soaryn)
 - Added a charged variant of the gadget to the creative and JEI (1.3.3)
 - Added RU translations (Thanks to @Smollet777)
 
 #### Changed
+
 - Disabled the default overlay when using the gadget to stop showing two highlights at the same time
-- There is no longer a middle man slot for upgrades in the upgrade table. You can now shift click upgrades right into the gadget and click the upgrade to remove it
+- There is no longer a middle man slot for upgrades in the upgrade table. You can now shift click upgrades right into
+  the gadget and click the upgrade to remove it
 - Slightly improved the light particle
 - The Mining Gadget can now ray trace through non-collidable blocks meaning it can now shoot though the Miners Light!
 - The Mining Gadget now adds to your break block stats :D
 
 #### Fixed
+
 - Fixed Mining gadget being voided when left in a Modification table and breaking the table
 - Fixed an issue with OneProbe on RenderBlock look at
 - Fixed typo in tooltips
 - Pushed the laser render to the right spot when running
 - We now respect the break block event being cancelled
 - Fixed voiding upgrades when normal clicking them in the modification table.
-- Allowing the Gadget to be used for infinite energy (1.3.3) 
+- Allowing the Gadget to be used for infinite energy (1.3.3)
 
 ### [1.3.1] - 2020-03-08
+
 #### Fixed
+
 - Beta release now. Fixed a few bugs reporting in 1.3.0
 
 ### [1.3.0] - 2020-03-03
+
 #### Added
+
 - The first release for 1.15.2 - I think its pretty stable? :)
 
 ## 1.14.4
+
 ### [1.2.5]
+
 #### Fixed
-- Fixed an issue causing the game to crash with the custom render blocks [#49](https://github.com/Direwolf20-MC/MiningGadgets/issues/49)
+
+- Fixed an issue causing the game to crash with the custom render
+  blocks [#49](https://github.com/Direwolf20-MC/MiningGadgets/issues/49)
 
 ### [1.2.4]
+
 #### Added
+
 - Added `ru` translations thanks to @Smollet777
 - You can now use the scroll wheel to change the sliders :D
 - You can now shift click into the filter
 
 #### Fixed
+
 - Fixed the filters not working #42
 - Fixed blacklist filtering system
 - Added checking to make sure the dimention also allows for block breaking
 - Partialy fixed an odd energy bug
 - Fixed edgecase crashing on the render block
 
 #### Changed
+
 - Optimised images and json files for a smaller mod build size
 - Took the time to bump Forge up to `28.2.4`
 
 ### [1.2.3]
+
 #### Added
+
 - Added Precision Mode (A Soaryn request!)
 
 ### [1.2.2]
+
 #### Fixed
+
 - Fixed a dupe bug - Thanks Soaryn.
 
 ### [1.2.1]
+
 #### Added
+
 - Added a tooltip to the upgrades and gadget to show RF costs.
 
 ### [1.2.0] - ?
+
 #### Added
+
 - The whole mod!
 
 # Example
+
 ## [MC-Verion, VERSION] - Date of release
+
 ### Added
 - 
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,8 @@ archivesBaseName = 'mininggadgets'
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 minecraft {
+    hideOfficialWarningUntilChanged
+
     // The mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   Snapshot are built nightly.
     // stable_#            Stables are built at the discretion of the MCP team.
@@ -91,54 +93,36 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
+    // JEI
     maven {
-        // JEI
         name = "Progwml6 maven"
         url = "https://dvs1.progwml6.com/files/maven/"
     }
+    //JEI fallback
     maven {
-        //JEI fallback
         name = "ModMaven"
         url = "https://modmaven.k-4u.nl"
     }
+    maven { url 'https://www.dogforce-games.com/maven/' }
     maven {
-        url 'https://www.dogforce-games.com/maven/'
-    }
-    maven {
-        url 'https://www.cursemaven.com'
+        url "https://www.cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
     }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
     //JEI
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
 
 //    runtimeOnly fg.deobf("curse.maven:inventory-tweaks-renewed:3102237")
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+    runtimeOnly fg.deobf("curse.maven:lollipop-347954:3232534")
+    runtimeOnly fg.deobf("curse.maven:powah-352656:352656")
+    runtimeOnly fg.deobf("curse.maven:mekanism-268560:268560")
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 #Mod Info
-mod_version=1.8.0
+mod_version=1.7.5
 #Dependencies
 mc_version=1.16.5
 forge_version=36.1.4
-mcp_version=20210309-1.16.5
 jei_version=1.16.5:7.6.4.86
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -1,7 +1,7 @@
 b7013e95c0f001eefb22e978563099d6af098f17 assets/mininggadgets/blockstates/minerslight.json
 c439c311ccd1a6a67fddc2eb5db3f7fc0e0af1e0 assets/mininggadgets/blockstates/modificationtable.json
 17f3e42d932950bb56cf0f43004c2badcef8cdc0 assets/mininggadgets/blockstates/renderblock.json
-61af57252e09709859d6eb45b59d252b02f6ad64 assets/mininggadgets/lang/en_us.json
+851095a3ca57fb651a2eabd0b99544bb67be4499 assets/mininggadgets/lang/en_us.json
 973359b4f13b4c70416dd8b3e68a3a4d8886f14f assets/mininggadgets/models/block/minerslight.json
 c4536a15fbe5781f373148363151ccc6f6686f48 assets/mininggadgets/models/block/modificationtable.json
 30eb13c57d2684c6de2f1d2edfb7e535599b3a61 assets/mininggadgets/models/block/renderblock.json
@@ -29,6 +29,8 @@ cb0c341c014dd44118b38cd3e92ee791868411b1 assets/mininggadgets/models/item/upgrad
 874d2494436b644dd14a7fd929681b977f611e4f assets/mininggadgets/models/item/upgrade_three_by_three.json
 78c4ab195fe9b83b63edfaef11c9c2819947bc90 assets/mininggadgets/models/item/upgrade_void_junk.json
 a4843d0fda4ad7b586ea116b9bce8718d7f84c4d data/mininggadgets/advancements/recipes/mininggadgets/mininggadget.json
+405d3a6ca01b5f819a5253b6e58fcaa1639d8758 data/mininggadgets/advancements/recipes/mininggadgets/mininggadget_fancy.json
+ad30bcb230535f85142d3d05a9cb388dc4b9c1ff data/mininggadgets/advancements/recipes/mininggadgets/mininggadget_simple.json
 3e054d08ee649172d7f210b913d870fe1db1371e data/mininggadgets/advancements/recipes/mininggadgets/modificationtable.json
 0fcaaf2f4b432fd60d54449fefdd5706db990acd data/mininggadgets/advancements/recipes/mininggadgets/upgrade_battery_1.json
 ff15676166a05c33049860b34a6f67a5ccaed1e1 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_battery_2.json
@@ -52,7 +54,9 @@ f807888493861b3ee63ed74a2bddf997b216a7cd data/mininggadgets/advancements/recipes
 a1eb419ef54621feac41d3d41e53f6be7ac73aa1 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_three_by_three.json
 29c96f292475ac42dd7ee0e64f8403aaea513a79 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_void_junk.json
 047033da6a4d6cef5bff96be21354484e5f876ce data/mininggadgets/loot_tables/blocks/modificationtable.json
-7fa522bdf73ad78d311527fca1267048d8ed8361 data/mininggadgets/recipes/mininggadget.json
+2d5e4999b2376faf91c606306c51fc97a79e94f2 data/mininggadgets/recipes/mininggadget.json
+01290e079fa59bd5c154b7fc905caa356eb9d3c8 data/mininggadgets/recipes/mininggadget_fancy.json
+ac137f1a51b69d50a90757c9aa829162c57cde41 data/mininggadgets/recipes/mininggadget_simple.json
 79e18311eaeb844f790480126735f839947e713e data/mininggadgets/recipes/modificationtable.json
 761e4b325f80ac475236082738093ade67438a42 data/mininggadgets/recipes/upgrade_battery_1.json
 a0f15250de5ca2ef051e240f590446acd9be3623 data/mininggadgets/recipes/upgrade_battery_2.json