Skip to content

Commit

Permalink
1.18.2 Update
Browse files Browse the repository at this point in the history
Yep, it's the entirety of the 1.18.2 update. This is technically version v1.15.0-alpha1 but I am pushing to the v1.14.0 indev branch because I plan to delete it and merge into the standard 1.18.x development branch after this commit.

Tons of changes, of course. Most are worldgen related, and now most structures are data-defined. Meaning, no more configuration of structures with the IW config file. Make a datapack!

Various entities have been tweaked for QoL reasons. Particularly, Tiltros entities have changed. Lava Revenants now have multiple hitboxes (i.e. head, body, tail, wings) and are overall more dangerous. They can break weak blocks to un-stuck themselves or to chase the player. Like the ender dragon. This also means different areas take different levels of damage. Try aiming for the head for extra damage. Of course, hitting areas like the tail will result in lower damage output.

Celestial Towers have not changed too much, but a lot of optimization has been completed. No more 50ms lag spikes when one tries to spawn! Additionally, Celestial Lanterns can be much more effective without destroying tick times.

Oh yeah, Tiltros exists again. Dimensions are back, because biomes exist again. Do note, this is done via the Terrablender library and it is MANDATORY. Tiltros also looks a bit different than before, this is because carvers are defined via JSON now and I created a new one from scratch instead of attempting to port the code-defined one to JSON.

Back to configuration changes, there are also no more options for disabling entity spawns. This is now done by modifying the biome/structure JSON for where they spawn. Again, make a datapack!

Some structures have been modified. Not much has changed for the most part. Battlefield structures have changed quite a bit however, and fit in much better now. Battlefield Villages no longer exist, and have been replaced with a small fortified town structure.

Some other refactoring or cleanup has occurred. Most is related to 1.18.2 changes, other bits are just for general cleanup.

Yes, I am aware that some bugs do exist and a lot of polishing can be done. That's why this is an alpha release.
  • Loading branch information
AnonymousHacker1279 committed Apr 15, 2022
1 parent 0e18d3c commit 2cfbac0
Show file tree
Hide file tree
Showing 156 changed files with 6,399 additions and 1,728 deletions.
43 changes: 20 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
![Immersive Weapons Logo](logo.png)

# Immersive Weapons for Minecraft 1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2
# Immersive Weapons for Minecraft 1.18.2/1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2

![CodeQL](https://github.com/AnonymousHacker1279/ImmersiveWeapons-Mod/workflows/CodeQL/badge.svg)
[![](http://cf.way2muchnoise.eu/full_494454_Downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/immersive-weapons)
[![](http://cf.way2muchnoise.eu/versions/494454.svg)](https://www.curseforge.com/minecraft/mc-mods/immersive-weapons)
[![CodeFactor](https://www.codefactor.io/repository/github/anonymoushacker1279/immersiveweapons/badge/master)](https://www.codefactor.io/repository/github/anonymoushacker1279/immersiveweapons/overview/master)

## A weapons mod for Minecraft 1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2
## A weapons mod for Minecraft

Immersive Weapons is <s>a weapons mod</s> more than just a weapons mod aiming to spice up your combat skills.

Expand Down Expand Up @@ -40,37 +40,34 @@ A few other notes:
Active development will be focused on the latest Minecraft version. You should upgrade to newer versions of Immersive
Weapons for bug fixes and new features.

When looking at the mod file, the version looks like this: "immersiveweapons-\<Minecraft version\>-\<Immersive Weapons
version\>". For example, "immersiveweapons-1.17.1-1.6.0". The Minecraft version is simple: it only changes when the mod
is updated to newer versions of Minecraft.
When looking at the mod file, the version looks like
this: `ImmersiveWeapons-<Minecraft version>-<Immersive Weapons version>`. For example, `ImmersiveWeapons-1.18.2-1.15.0`.
The Minecraft version is simple: it only changes when the mod is updated to newer versions of Minecraft.

The Immersive Weapons version is a bit more complex:
When the first number changes (**1**.6.0), it is a major change. For example, changing from a beta to a full release.
This probably won't change.
When the second number changes (1.**6**.0), it is a minor change. For example, adding new features, improvements, etc.
When the first number changes (**1**.15.0), it is a major change. For example, changing from an in-dev to a full
release. This probably won't ever change.
When the second number changes (1.**15**.0), it is a minor change. For example, adding new features, improvements, etc.
These are usually content releases or large rewrites.
When the third number changes (1.6.**0**), it is a bugfix/patch. These are small changes that correct behaviors or
When the third number changes (1.15.**0**), it is a bugfix/patch. These are small changes that correct behaviors or
otherwise add small functionalities.

You should always update to the latest bugfix/patch version. Updating to the latest minor version is also recommended,
but can be treated with a lower priority. Read the update changelogs associated with new releases for any important
information about that release.

This table lists the latest Immersive Weapons version for a Minecraft version. If anything is listed other than **Latest**,
consider it to be at the End of Life. In some cases, an older version will receive bugfixes should the
This table lists the latest Immersive Weapons version for a Minecraft version. If anything is listed other than
**Latest**, consider it to be at the End of Life. In some cases, an older version will receive bugfixes should the
community describe an interest in it (This excludes versions listed as **N/A - Build From Source**).

| MC Version | Immersive Weapons Version Support |
| :-- | :-- |
| 1.18.1 | [(BETA) Latest](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases) |
| 1.18 | [(BETA) 1.13.0-beta9](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.13.0-beta9) |
| 1.17.1 | [1.12.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.12.1) |
| 1.16.5 | [1.4.3](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.4.3) |
| 1.16.4 | [1.1.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.1.1) |
| 1.15.2 | [N/A - Build From Source](https://github.com/AnonymousHacker1279/ImmersiveWeapons/tree/1.15.2-dev) |

***Note: 1.18.x releases are currently in a beta state due to major breaking changes in the Forge API and MC 1.18.
Expect missing features and potential game-breaking bugs.***
| MC Version | Immersive Weapons Latest Version |
|------------|--------------------------------------------------------------------------------------------------------------|
| 1.18.2 | [(ALPHA) Latest](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases) |
| 1.18.1 | [(ALPHA) 1.14.0-alpha1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.14.0-alpha1) |
| 1.17.1 | [1.12.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.12.1) |
| 1.16.5 | [1.4.3](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.4.3) |
| 1.16.4 | [1.1.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.1.1) |
| 1.15.2 | [N/A - Build From Source](https://github.com/AnonymousHacker1279/ImmersiveWeapons/tree/1.15.2-dev) |

## Contributing

Expand Down Expand Up @@ -104,4 +101,4 @@ Translations other than English are generated automatically using
my [Mr. Worldwide](https://github.com/AnonymousHacker1279/MrWorldwide) toolkit. Chances are that it's not completely
accurate and needs refinements. I do not have the time nor will to refine these.

If you want to clean up the translations then go ahead and make a contribution. I appreciate it.
If you want to clean up the translations then go ahead and make a contribution. I appreciate it.
23 changes: 17 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ buildscript {
repositories {
maven { url = 'https://maven.minecraftforge.net' }
maven { url = 'https://maven.parchmentmc.org' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
Expand Down Expand Up @@ -108,22 +110,27 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
dependencies {
implementation 'org.jetbrains:annotations:23.0.0'

minecraft forge_version
minecraft "net.minecraftforge:forge:${forge_version}"

// Include JEI
implementation fg.deobf(jei_version)
implementation fg.deobf("mezz.jei:jei-${jei_version}")

// Include WTHIT
implementation fg.deobf(wthit_version)
compileOnly fg.deobf("mcp.mobius.waila:wthit-api:${wthit_version}")
runtimeOnly fg.deobf("mcp.mobius.waila:wthit:${wthit_version}")

// Include Patchouli
compileOnly fg.deobf(patchouli_version + ":api")
runtimeOnly fg.deobf(patchouli_version)
compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")

// Include TerraBlender
implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${terrablender_version}")
}

// This block of code expands all the gradle properties in the specified resource targets.
// It copies them into the targets and expands all the defined properties.
def resourceTargets = ['data/immersiveweapons/patchouli_books/encyclopedia/book.json']
def resourceTargets = ['data/immersiveweapons/patchouli_books/encyclopedia/book.json',
'data/immersiveweapons/patchouli_books/lorebook/book.json']
def intoTargets = ["$rootDir/out/production/resources/", "$rootDir/out/production/${project.name}.main/", "$rootDir/bin/main/"]
def replaceProperties = [build_version: version]
processResources {
Expand Down Expand Up @@ -175,4 +182,8 @@ publishing {
url "file:///${project.projectDir}/mcmodsrepo"
}
}
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}
16 changes: 9 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
org.gradle.jvmargs=-Xmx6G
org.gradle.daemon=true
version=1.18.1-1.14.0-alpha1
group='com.anonymoushacker1279.immersiveweapons'
org.gradle.caching=true
version=1.18.2-1.15.0-alpha1
group=com.anonymoushacker1279.immersiveweapons
mappings_channel=parchment
mappings_version=2022.02.13-1.18.1
forge_version=net.minecraftforge:forge:1.18.1-39.0.79
jei_version=mezz.jei:jei-1.18.1:9.2.1.69
wthit_version=mcp.mobius.waila:wthit:forge-4.4.1
patchouli_version=vazkii.patchouli:Patchouli:1.18.1-65
mappings_version=2022.03.13-1.18.2
forge_version=1.18.2-40.0.52
jei_version=1.18.2:9.5.5.174
wthit_version=forge-4.8.1
patchouli_version=1.18.2-66
terrablender_version=1.18.2-1.1.0.99
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 16 additions & 0 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ f995b98ddd6c2aa73e389a839352cab305b6391f data/forge/tags/items/ores.json
5008cd4f1f91800ff687533702cbd7591d4b27fc data/forge/tags/items/ores/cobalt.json
587fc72deca2e0aed8867449c0b88e0ab18f1e1c data/forge/tags/items/pickaxes.json
abae19f6a9ecfe01b9c3b51f78460e6ac38eb66c data/forge/tags/items/stained_glass.json
3f9e7fb85fae3311cef7bfad370f42797c1d38e7 data/forge/tags/worldgen/biome/plains.json
60760042df8807aa72082c5e595668c4dc22d3e6 data/immersiveweapons/advancements/almost_flying.json
48919cf5515b1f85a4686d98169cf34fedbed4c3 data/immersiveweapons/advancements/bamboo.json
0c16958cb896e659855bd761486c87d875e77d0c data/immersiveweapons/advancements/bandage.json
Expand Down Expand Up @@ -783,6 +784,8 @@ a6a67131213ed5eb7fef362bbff1eb8ca0520ec5 data/immersiveweapons/loot_tables/block
4009dfc6cbe9cb6dc6f6e5e30362fd53e69dd81e data/immersiveweapons/loot_tables/chests/abandoned_factory.json
e897849a77167446ed73aaa42bddb30b74c6ea24 data/immersiveweapons/loot_tables/chests/battlefield_camp.json
cd2649687f773f9045f700f3fd7279a814d5524b data/immersiveweapons/loot_tables/chests/campsite.json
7ddb0f0065e8f029b4484471cf342b90b375d3f3 data/immersiveweapons/loot_tables/chests/hans_hut.json
25e8d0076939766b60dbcada1fb4c103afb97588 data/immersiveweapons/loot_tables/chests/hans_hut_cask.json
f3b6c546b254b8848e07375c340b4540f43c5241 data/immersiveweapons/loot_tables/chests/underground_bunker.json
3ac1b93a040e55e5702b2c8d379388d5742b9eab data/immersiveweapons/loot_tables/chests/village/battlefield/medic_station.json
e3fd678e0ed59a25e044d6362d182e4ce909a133 data/immersiveweapons/loot_tables/entities/celestial_tower.json
Expand Down Expand Up @@ -1054,6 +1057,19 @@ ce6a439f5218f0d986eae08079ab065c43849b4f data/immersiveweapons/tags/items/ingots
6d77011fb8a4045c9ddf3688c843176b546588be data/immersiveweapons/tags/items/shards/stone.json
6fb989e362e1eafadf5f7732112cf2fe1f2d8d8b data/immersiveweapons/tags/items/shards/ventus.json
c623b6e951eb3860b531efd062af5eb2bb9a43d7 data/immersiveweapons/tags/items/shards/wood.json
bb4a9463fae39c80214255ebf1986f8693265327 data/immersiveweapons/tags/worldgen/biome/has_structure/abandoned_factory.json
c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/battlefield_camp.json
c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/battlefield_town.json
bb4a9463fae39c80214255ebf1986f8693265327 data/immersiveweapons/tags/worldgen/biome/has_structure/bear_trap.json
6f9010dc04d2773e6f842f5add27c58b0d264486 data/immersiveweapons/tags/worldgen/biome/has_structure/campsite.json
71042e21fd1d94d561cae1a37ebc786691b4f03a data/immersiveweapons/tags/worldgen/biome/has_structure/cloud_island.json
c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/destroyed_house.json
c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/graveyard.json
7a1ebecb0ab724b1dcadcf96c1a24ca1aaedec0c data/immersiveweapons/tags/worldgen/biome/has_structure/hans_hut.json
2d7bb792b86a5ab3c8d226bd3cbb7e515e7f515d data/immersiveweapons/tags/worldgen/biome/has_structure/landmine_trap.json
119d2b725236b726fd60e98739cae9a59c48e077 data/immersiveweapons/tags/worldgen/biome/has_structure/pitfall_trap.json
bb4a9463fae39c80214255ebf1986f8693265327 data/immersiveweapons/tags/worldgen/biome/has_structure/underground_bunker.json
727a5f00b9a44f2a27905600c764d5d49ac82f8a data/immersiveweapons/tags/worldgen/biome/has_structure/water_tower.json
23996d7fbe141750e73cfd3ab54f873eadf9cc7d data/minecraft/advancements/recipes/misc/gunpowder.json
5d88debdd7eeb96cf5d502b301e4490d599983dc data/minecraft/recipes/gunpowder.json
4a45573a35d3979a08a43e699a64fbda69d0332a data/minecraft/tags/blocks/fences.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"minecraft:plains",
"minecraft:snowy_plains",
"minecraft:sunflower_plains"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"type": "minecraft:chest",
"pools": [
{
"rolls": {
"type": "minecraft:uniform",
"min": 4.0,
"max": 6.0
},
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"weight": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 6.0
},
"add": false
}
],
"name": "minecraft:salmon"
},
{
"type": "minecraft:item",
"weight": 5,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 6.0
},
"add": false
}
],
"name": "minecraft:cod"
},
{
"type": "minecraft:item",
"weight": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 3.0
},
"add": false
}
],
"name": "immersiveweapons:bottle_of_alcohol"
},
{
"type": "minecraft:item",
"weight": 4,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 3.0
},
"add": false
}
],
"name": "immersiveweapons:bottle_of_wine"
},
{
"type": "minecraft:item",
"weight": 3,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 1.0
},
"add": false
},
{
"function": "minecraft:enchant_randomly"
}
],
"name": "minecraft:iron_sword"
},
{
"type": "minecraft:item",
"weight": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1.0,
"max": 1.0
},
"add": false
},
{
"function": "minecraft:enchant_randomly"
}
],
"name": "minecraft:iron_helmet"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"type": "minecraft:chest",
"pools": [
{
"rolls": {
"type": "minecraft:uniform",
"min": 6.0,
"max": 9.0
},
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"weight": 2,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 8.0,
"max": 32.0
},
"add": false
}
],
"name": "minecraft:wheat"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 8.0,
"max": 16.0
},
"add": false
}
],
"name": "minecraft:sweet_berries"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:plains",
"#minecraft:is_forest"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"immersiveweapons:battlefield"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"immersiveweapons:battlefield"
]
}
Loading

0 comments on commit 2cfbac0

Please sign in to comment.