Skip to content

Commit

Permalink
Merge branch 'wip-features'
Browse files Browse the repository at this point in the history
  • Loading branch information
PiTheGuy committed Jun 11, 2022
2 parents 3c6731b + 6c44432 commit 2536a97
Show file tree
Hide file tree
Showing 162 changed files with 4,441 additions and 3,222 deletions.
7 changes: 5 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Auto detect text files and perform LF normalization
* text=auto
# Disable autocrlf on generated files, they always generate with LF
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ build
# other
eclipse
run
Mod Changelog.txt

# Files from Forge MDK
forge*changelog.txt
55 changes: 26 additions & 29 deletions Mod Changelog.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
## Magic Shelter
- Using this item on a block spawns a mostly obsidian structure around the player to protect them
- The second floor has a chest with loot containing magic powder, crystals, nuggets, cores, and gems, as well as a chance to get one of 2 new enchantments _(see below for more details)_
- Only places if there's ground directly beneath the player, and there's enough space
## Magic Miner
- Automatically mines blocks
- Requires fuel from a nearby Magic Energizer _(see below)_
- Can be upgraded with the new upgrades _(see below)_
- Only mines blocks best mined with a pickaxe or shovel
- Automatically stops when inventory fills up
- Crafted as follows:
- ![Magic Shelter Recipe](https://user-images.githubusercontent.com/55959311/166120665-a00db5b7-b3d7-4e55-b10d-91f33d196d9f.png)
## Magic Finder Enchantment
- New treasure enchantment
- Can be applied to tools (pickaxe, axe, and shovel)
- Max level of 3
- Found in Magic Shelter loot chests
- Grants a 10% chance per level to drop a magic powder when a block is mined (2% on insta-mineable blocks)
- **WARNING: Doesn't work on vanilla tools!**
## Veinminer Enchantment
- New treasure enchantment
- Can be applied to pickaxes
- Max level of 3
- Found in Magic Shelter loot chests
- Automatically breaks block of the same type in an area around any block broken, similar to the Veinminer mod
- Affected area grows with enchantment level (3x3 for level 1, 5x5 for level 2, etc.)
- Only works if you're using the right tool
- **WARNING: Doesn't work on vanilla tools!**
## Magic Spike
- New spike-shaped block that deals 10x fall damage when fallen on
- Useful for mob farms and traps
![Magic Miner Recipe](https://user-images.githubusercontent.com/55959311/173133628-b3f1781d-6e90-49d6-81e5-3f84761622f0.png)
## Magic Logger
- Works the same as the Magic Miner except mines logs and leaves instead
- Also mines blocks above the logger instead of below
- Crafted as follows:
- ![Magic Spike Recipe](https://user-images.githubusercontent.com/55959311/166122283-da78b9cc-5f50-437b-af34-4444bca5d73a.png)
![Magic Logger Recipe](https://user-images.githubusercontent.com/55959311/173133439-5413f25c-c309-4f6d-ae58-f5af78d9ba8c.png)
## Magic Energizer
- Powers Magic Miners and Magic Loggers within 4 blocks
- Requires Magic Fuel _(see below)_ to operate
- Crafted as follows:
![Magic Energizer Recipe](https://user-images.githubusercontent.com/55959311/173197590-180a986c-c4ff-412d-92f5-2ae64016f887.png)
## Magic Fuel
- Used to power Magic Energizers
- Crafted as follows:
![Magic Fuel Recipe](https://user-images.githubusercontent.com/55959311/173133307-903e84f9-265a-42fe-9692-687b7fde4de0.png)
## Magic Gear
- Used to craft Magic Loggers, Miners, and Energizers
- Found in Magic Shelter chests
## Other Changes and Bug Fixes
- Added a close sound for the magic crate
- Magic Pearls now deal a lot less damage
- Reduced cooldown for Magic Pearls
- Fortune now affects magic ore drops
- Updated mod to 1.18 (1.19 coming soon)
- Added Deepslate Magic Ore as a deepslate counterpart to Magic Ore
- Tall grass no longer prevents the Magic Shelter from placing
51 changes: 22 additions & 29 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,53 +1,46 @@
-------------------------------------------

Source installation information for modders
-------------------------------------------
This code follows the Minecraft Forge installation methodology. It will apply
some small patches to the vanilla MCP source code, giving you and it access
to some of the data and functions you need to build a successful mod.

Note also that the patches are built against "unrenamed" MCP source code (aka
srgnames) - this means that you will not be able to read them directly against
Note also that the patches are built against "un-renamed" MCP source code (aka
SRG Names) - this means that you will not be able to read them directly against
normal code.

Source pack installation information:

Standalone source installation
Setup Process:
==============================

See the Forge Documentation online for more detailed instructions:
http://mcforge.readthedocs.io/en/latest/gettingstarted/

Step 1: Open your command-line and browse to the folder where you extracted the zip file.

Step 2: You're left with a choice.
If you prefer to use Eclipse:
1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux)
1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
2. Open Eclipse, Import > Existing Gradle Project > Select Folder
or run "gradlew eclipse" to generate the project.
(Current Issue)
4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment
5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4.
or run `gradlew eclipse` to generate the project.

If you prefer to use IntelliJ:
1. Open IDEA, and import project.
2. Select your build.gradle file and have it import.
3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
4. Refresh the Gradle Project in IDEA if required.

If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again.
If at any point you are missing libraries in your IDE, or you've run into problems you can
run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything
{this does not affect your code} and then start the process again.

Should it still not work,
Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
or the Forge Project Discord discord.gg/UvedJ9m
Mapping Names:
=============================
By default, the MDK is configured to use the official mapping names from Mojang for methods and fields
in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
license, if you do not agree with it you can change your mapping names to other crowdsourced names in your
build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here:
https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md

Forge source installation
Additional Resources:
=========================
MinecraftForge ships with this code and installs it as part of the forge
installation process, no further action is required on your part.

LexManos' Install Video
=======================
https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be

For more details update more often refer to the Forge Forums:
http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/
LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0
Forge Forum: https://forums.minecraftforge.net/
Forge Discord: https://discord.gg/UvedJ9m
Loading

0 comments on commit 2536a97

Please sign in to comment.