Skip to content

Commit

Permalink
Merge branch '1.16.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelHillcox committed Aug 21, 2020
2 parents 0ab91d0 + 61c4301 commit 6b162a8
Show file tree
Hide file tree
Showing 71 changed files with 553 additions and 194 deletions.
82 changes: 76 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
# Mining Gadgets Changelog
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [1.15.2, 1.3.5] - 2020-03-29
### Added
## 1.16.2
### [1.5.0] - 2020-08-14

#### Changed
- Updated to 1.16 :+1:

## 1.16.1
### [1.4.1] - unreleased
#### 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 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
- 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

#### Fixed

- [#98] Config changes did not affect upgrade costs.
- Fixed client crash on shift clicking items to the Modification Table
- 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.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
Expand All @@ -12,14 +44,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Added a charged variant of the gadget to the creative and JEI (1.3.3)
- Added RU translations (Thanks to @Smollet777)

### Changed
#### 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
- 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
- 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
Expand All @@ -28,8 +60,46 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fixed voiding upgrades when normal clicking them in the modification table.
- Allowing the Gadget to be used for infinite energy (1.3.3)

## [1.14.4, 1.0.0] - ?
### Added
### [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.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
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ minecraft {
}

sourceSets.main.resources { srcDir 'src/generated/resources' }

repositories {
maven {
// JEI
Expand All @@ -104,6 +105,7 @@ repositories {
url 'https://www.dogforce-games.com/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.
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
#Mod Info
mod_version=1.4.0
mod_version=1.4.1
#Dependencies
forge_version=1.16.1-32.0.63
forge_version=1.16.1-32.0.108
mcp_version=20200712-1.16.1
jei_version=1.16.1:7.0.0.6
jei_version=1.16.1:7.0.1.10
53 changes: 28 additions & 25 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
b7013e95c0f001eefb22e978563099d6af098f17 assets/mininggadgets/blockstates/minerslight.json
c2b2d34c116a3d6da9c62ce72021bd999590e3f2 assets/mininggadgets/blockstates/modificationtable.json
17f3e42d932950bb56cf0f43004c2badcef8cdc0 assets/mininggadgets/blockstates/renderblock.json
9b0d83d36145975cf2e0f2aa60cbbc4ed6e976de assets/mininggadgets/lang/en_us.json
ce3df1f391ab2c77491ef868783a7172ab3d99c8 assets/mininggadgets/models/block/minerslight.json
2a77a20ef18ce7564fd36090887955828fbc2d85 assets/mininggadgets/models/block/modificationtable.json
36717b860f1ae48e4ab1a72cd4cf5cdc481c5d2a assets/mininggadgets/models/block/renderblock.json
7b6864bd530b82aea92048d3b5208b716a30ae07 assets/mininggadgets/lang/en_us.json
973359b4f13b4c70416dd8b3e68a3a4d8886f14f assets/mininggadgets/models/block/minerslight.json
a28c42b7d4a511d87ae88461f1845ed1b6bbc401 assets/mininggadgets/models/block/modificationtable.json
30eb13c57d2684c6de2f1d2edfb7e535599b3a61 assets/mininggadgets/models/block/renderblock.json
c7cb89cde2f2fa96162238c434620e5c5093e1e0 assets/mininggadgets/models/item/minerslight.json
18734ba6f77297dd2b3ca6f3b8ef706a4456e52b assets/mininggadgets/models/item/modificationtable.json
101767260cae85358ea8066f2b29497bbd39c241 assets/mininggadgets/models/item/upgrade_battery_1.json
441b07000c7e33c678aea7f84e348c816540d4db assets/mininggadgets/models/item/upgrade_battery_2.json
f90ee7125d690af479c91ba321e392258a3292f6 assets/mininggadgets/models/item/upgrade_battery_3.json
b2a4e32e2dd984c2c02ac943954d5c49cc987d6d assets/mininggadgets/models/item/upgrade_efficiency_1.json
f81d050842a1a25de54f285e7854260b70497aef assets/mininggadgets/models/item/upgrade_efficiency_2.json
9aa706e419c45edde9a55b62a71abf1c95bbadf1 assets/mininggadgets/models/item/upgrade_efficiency_3.json
99b3a6f834cb2a9cbffcc62984a0174b0960891d assets/mininggadgets/models/item/upgrade_efficiency_4.json
608ba244eba169219fe8b7da1c653dc556b42c24 assets/mininggadgets/models/item/upgrade_efficiency_5.json
05c7b227dea9c2191dae904668e25b4191caea26 assets/mininggadgets/models/item/upgrade_empty.json
c390605ae8278743d37fdd983fc5a14beb83626a assets/mininggadgets/models/item/upgrade_fortune_1.json
b7f9668b5187a8f327caa4d2b6f04be792ca8b6a assets/mininggadgets/models/item/upgrade_fortune_2.json
573fbcd143a7e6235fae38e18917df94f1a0cefa assets/mininggadgets/models/item/upgrade_fortune_3.json
d3c6a1e5bf2e5bb4e86390c564275618c1a90cd7 assets/mininggadgets/models/item/upgrade_freezing.json
b17d79c81dc26f54521cfd43d38f89716f9a613f assets/mininggadgets/models/item/upgrade_light_placer.json
7858a8472687d37e6bb382ba488a8fd25afb0e44 assets/mininggadgets/models/item/upgrade_magnet.json
b9bf7d0ef3f307e386537f388a3ef1e21fda91f8 assets/mininggadgets/models/item/upgrade_range_1.json
158c7fe8365e6ad0821db0fe327f78002793c964 assets/mininggadgets/models/item/upgrade_range_2.json
79fc52072c1ef8afd510215ac84b324ef4bac4d7 assets/mininggadgets/models/item/upgrade_range_3.json
830d8d2a7922eb33942d6f73aaa7b1708fd1777c assets/mininggadgets/models/item/upgrade_silk.json
27a1c29dec507aa043fcd44962ebe1d03d81e950 assets/mininggadgets/models/item/upgrade_three_by_three.json
50e40e2cd1b5afd7f06b32987b424e6d94d74539 assets/mininggadgets/models/item/upgrade_void_junk.json
03124e1ba86f9be7fb64caa66fe5bbb752cae3f2 assets/mininggadgets/models/item/upgrade_battery_1.json
0bf32736a1afe3582737acd30e13b91f1928c45d assets/mininggadgets/models/item/upgrade_battery_2.json
fdee7ff3eea155e8947b3a67398bacd160e75e48 assets/mininggadgets/models/item/upgrade_battery_3.json
7b95ba53768f6d2c1f810c983d58c3d827b23fbc assets/mininggadgets/models/item/upgrade_efficiency_1.json
49f634bcad8f9f0f9a30fa3fb78233fe546adb1d assets/mininggadgets/models/item/upgrade_efficiency_2.json
7c51e8a30851c918d414a827f3c6c757f08717bd assets/mininggadgets/models/item/upgrade_efficiency_3.json
31c29ea8c58ce269610dbcd92bcdc5658c2792c1 assets/mininggadgets/models/item/upgrade_efficiency_4.json
191def03fffa72f3aa414c0c85c59d56d76f5779 assets/mininggadgets/models/item/upgrade_efficiency_5.json
194518d5d2faf78756434fa1a18f8f2ad9583296 assets/mininggadgets/models/item/upgrade_empty.json
e6161f1c39ffd96a5005da98f5f8ca4282bda0ce assets/mininggadgets/models/item/upgrade_fortune_1.json
e2815e3ce5b9f75cbd4af7d54aa9366d06f52f77 assets/mininggadgets/models/item/upgrade_fortune_2.json
8e9049ad71e2f33f613b6669a5ca80ac5bc57786 assets/mininggadgets/models/item/upgrade_fortune_3.json
ba8917e3c2d877da76ab22c8b74527d88035fb46 assets/mininggadgets/models/item/upgrade_freezing.json
27927c9fb7122ba8e3a22f79b03af9b3390da023 assets/mininggadgets/models/item/upgrade_light_placer.json
a886745775c5c632a20d5232a3bbec5650815a47 assets/mininggadgets/models/item/upgrade_magnet.json
f73ebc92f07527746d919afe2797686a4c8ec76d assets/mininggadgets/models/item/upgrade_paver.json
9490052868ec9732110ac60f56f0d3225537ecd2 assets/mininggadgets/models/item/upgrade_range_1.json
cb0c341c014dd44118b38cd3e92ee791868411b1 assets/mininggadgets/models/item/upgrade_range_2.json
7f4c09db6454ab72dc8728d88f6c781b1072f3cc assets/mininggadgets/models/item/upgrade_range_3.json
72a06fd3b75df16c683ce816a52802f603580c47 assets/mininggadgets/models/item/upgrade_silk.json
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
3e054d08ee649172d7f210b913d870fe1db1371e data/mininggadgets/advancements/recipes/mininggadgets/modificationtable.json
0fcaaf2f4b432fd60d54449fefdd5706db990acd data/mininggadgets/advancements/recipes/mininggadgets/upgrade_battery_1.json
Expand All @@ -45,6 +46,7 @@ bd2411710dbace4b2fd6bd497f1b72f5c38bb1cb data/mininggadgets/advancements/recipes
0dadf0a570e4dd3f6a58dfc3e353358189c7d7cc data/mininggadgets/advancements/recipes/mininggadgets/upgrade_freezing.json
1d5c700c2094424a0d8715bcb06f824c6b7f586f data/mininggadgets/advancements/recipes/mininggadgets/upgrade_light_placer.json
1d39e37715fc3cbb835061e6b3a0368233afd12e data/mininggadgets/advancements/recipes/mininggadgets/upgrade_magnet.json
eb2745d644ec190f2ce7f89cf10f9d6b99463562 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_paver.json
309536ff89d635953a5e4667cd9acc23803d9bf7 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_range_1.json
e8da478c9942f6af968c57b1a8cbabe4618d2a90 data/mininggadgets/advancements/recipes/mininggadgets/upgrade_range_2.json
f807888493861b3ee63ed74a2bddf997b216a7cd data/mininggadgets/advancements/recipes/mininggadgets/upgrade_range_3.json
Expand All @@ -69,6 +71,7 @@ aa2f3c7f4bac48370c1fe3caed05cce522a042d7 data/mininggadgets/recipes/upgrade_fort
b467cc07cf27fba3063df81a633a47bc25be5435 data/mininggadgets/recipes/upgrade_freezing.json
7af68c6d0182139282d7dd736de48e77077bec44 data/mininggadgets/recipes/upgrade_light_placer.json
e10f01adc6b02ca619c083abc87890fd713fbd8b data/mininggadgets/recipes/upgrade_magnet.json
36ede190249a62220d76ea7e599caa3bf1a793fa data/mininggadgets/recipes/upgrade_paver.json
4b4bf63d46c738ff042d3216373ff29e0df6625f data/mininggadgets/recipes/upgrade_range_1.json
ef0547b32ed33ab3a42b7a39ab0cf3c689466472 data/mininggadgets/recipes/upgrade_range_2.json
1e4dbf81b1aed88f76c29c26c00a65ddc6ee93b1 data/mininggadgets/recipes/upgrade_range_3.json
Expand Down
18 changes: 12 additions & 6 deletions src/generated/resources/assets/mininggadgets/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"item.mininggadgets.upgrade_freezing": "Upgrade: Freezing",
"item.mininggadgets.upgrade_light_placer": "Upgrade: Light Placer",
"item.mininggadgets.upgrade_magnet": "Upgrade: Magnet",
"item.mininggadgets.upgrade_paver": "Upgrade: Paver",
"item.mininggadgets.upgrade_range_1": "Upgrade: Range, Tier 1",
"item.mininggadgets.upgrade_range_2": "Upgrade: Range, Tier 2",
"item.mininggadgets.upgrade_range_3": "Upgrade: Range, Tier 3",
Expand All @@ -28,27 +29,31 @@
"itemGroup.mininggadgets": "Mining Gadgets",
"mininggadgets.gadget.energy": "Energy: %d/%d",
"mininggadgets.gadget.range_change": "Range Change: %1$d x %1$d",
"mininggadgets.text.empty_table_helper": "Shift click to insert from your slots\nor drop upgrade onto this screen.\n\nClick upgrade to remove.",
"mininggadgets.text.modification_table": "Modification Table",
"mininggadgets.text.open_gui": "Open Mining Gadget Settings",
"mininggadgets.tooltip.item.battery_boost": "Battery Boost: %1$d",
"mininggadgets.tooltip.item.break_cost": "Per Block Cost: %1$d",
"mininggadgets.tooltip.item.show_upgrades": "Hold %s to show upgrades",
"mininggadgets.tooltip.item.upgrade_cost": "Upgrade Cost: %1$d",
"mininggadgets.tooltip.item.upgrades": "Current Upgrades:",
"mininggadgets.tooltip.item.use_cost": "+%1$d FE per use",
"mininggadgets.tooltip.screen.beam_preview": "Beam preview",
"mininggadgets.tooltip.screen.blacklist": "Blacklist active",
"mininggadgets.tooltip.screen.blue_inner": "Blue Inner",
"mininggadgets.tooltip.screen.blue_outer": "Blue Outer",
"mininggadgets.tooltip.screen.block_break_style": "Breaking Style",
"mininggadgets.tooltip.screen.blue": "Blue",
"mininggadgets.tooltip.screen.delay_explain": "Controls how often a freeze particle is spawned\nby default it is one particle every tick, to reduce\nthe amount of particles add more delay",
"mininggadgets.tooltip.screen.edit_filters": "Edit Filters",
"mininggadgets.tooltip.screen.fade": "Fade Blocks",
"mininggadgets.tooltip.screen.freeze_delay": "Freeze Delay",
"mininggadgets.tooltip.screen.green_inner": "Green Inner",
"mininggadgets.tooltip.screen.green_outer": "Green Outer",
"mininggadgets.tooltip.screen.green": "Green",
"mininggadgets.tooltip.screen.inner_color": "Inner beam color",
"mininggadgets.tooltip.screen.mining_gadget": "Gadget Settings",
"mininggadgets.tooltip.screen.no_upgrades": "No Upgrades available",
"mininggadgets.tooltip.screen.outer_color": "Outer glow color",
"mininggadgets.tooltip.screen.precision_mode": "Precision Mode: %1$d",
"mininggadgets.tooltip.screen.range": "Range",
"mininggadgets.tooltip.screen.red_inner": "Red Inner",
"mininggadgets.tooltip.screen.red_outer": "Red Outer",
"mininggadgets.tooltip.screen.red": "Red",
"mininggadgets.tooltip.screen.shrink": "Shrink Blocks",
"mininggadgets.tooltip.screen.size": "Size: %1$d x %1$d",
"mininggadgets.tooltip.screen.ticks": "ticks",
Expand All @@ -67,6 +72,7 @@
"tooltop.mininggadgets.freezing": "Freezes water and stops lava in it's place!",
"tooltop.mininggadgets.light_placer": "Places touches whenever the surroundings light level is lower than 8",
"tooltop.mininggadgets.magnet": "Deconstructs blocks right into your inventory",
"tooltop.mininggadgets.paver": "Creates a path for you as you mine",
"tooltop.mininggadgets.range": "Extends your range by 5 times with each tier",
"tooltop.mininggadgets.silk": "Applies the silk touch enchant to the Mining Gadget",
"tooltop.mininggadgets.three_by_three": "Allows for a 3x3 mining radius",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "mininggadgets:block/minerslight"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/cube",
"parent": "minecraft:block/cube",
"textures": {
"down": "mininggadgets:block/modificationtable_bottom",
"up": "mininggadgets:block/modificationtable_top",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/cube_all",
"parent": "minecraft:block/cube_all",
"textures": {
"all": "mininggadgets:block/renderblock"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_battery_1"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_battery_2"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_battery_3"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_efficiency_1"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_efficiency_2"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_efficiency_3"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_efficiency_4"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_efficiency_5"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_empty"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_fortune_1"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_fortune_2"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_fortune_3"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_freezing"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_light_placer"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mininggadgets:item/upgrade_magnet"
}
Expand Down
Loading

0 comments on commit 6b162a8

Please sign in to comment.