Skip to content

Commit

Permalink
The Entirety of v1.14.0-alpha1 at Once
Browse files Browse the repository at this point in the history
Yep, this is basically all of v1.14.0-alpha1 in one commit. There's still more planned, but this commit takes out about two thirds of it.

So what's new?
- Encyclopedia: A book provided via Patchouli that provides information on every block and item in the game, along with useful information for getting started. (It does not currently have resources like the warrior statue pieces or azul stained orchids, as those are currently unavailable naturally as biomes are still missing)
  - The encyclopedia is given to every player when they join the world. It can be crafted though.
  - Entries unlock as players explore and complete advancements.
- Along with the Encyclopedia, most items have been rewritten to provide better functionality or to reduce jankiness. Here's a list of those items (hopefully I don't miss any...):
  - Tables: Yep, its plural now. The wooden table has been replaced with an oak table, and there are variants for all woods now.
  - Sulfur: Now there's a raw sulfur block for decoration purposes.
  - Molten & Tesla Plates: No longer exist. Recipes using them were removed a while ago, and they don't serve any purpose now.
  - Copper and Cobalt Hoes: Attack speed has been nerfed because I left them at `5f` and didn't realize how broken that was.
  - Recipe Changes: Various recipes have changed.
  - Mortar: Now has a custom sound when firing, and right-click behavior is a bit nicer.
  - Panic Alarm: Has been reduced to only one alarm sound. The extra sounds weren't really useful and just made it harder to maintain. And now, it's a lot more consistent.
  - Sandbag: Now release sand cloud particles when being shot at with projectiles.
  - Spotlight: Now casts light in a beam in front of itself.
  - Burned Oak Branch: Now can be placed on any burned oak log that's properly tagged.
  - Landmine: Right-click behavior is less finicky now.
  - Punji Sticks: Damage calculation has been completely rewritten and is a lot more dangerous now. And damage is properly calculated based on fall distance.
  - Blood Particles: Completely rewritten. Now entities leave a blood trail for a short period of time when bleeding.
  - Smoke Bomb Particles: Completely rewritten. Smoke generates much more smoothly, and is more realistic. Colors have also been tweaked. Smoke also persists for longer.
  - Molotov Cocktails: Fire effect completely rewritten. Less janky, and now spreads properly if its thrown on an uneven surface. It doesn't throw as absurdly far now either.
  - Gauntlets: Attack speed increased.
  - Molten Ingots: Now act as a furnace fuel.
  - Musket Balls: Hitboxes are now smaller and fit better. Instead of using the same sized hitboxes as arrows, musket balls have half of the size.
  - Tesla Armor: Custom equip sound. Coming Soon™ to other armors.
  - Bandages / First Aid Kits: Now instantly clear any bleeding effects. When being used on other entities, the "half-time" property no longer exists. The player using it still gets the effects.
  - Morphine:  When being used on other entities, the "half-time" property no longer exists. The player using it still gets the effects.
  - Flintlock Pistol/Blunderbuss: Every bullet is no longer critical. Now, each bullet has a 10% chance to be critical.
  - Smoke Bombs: They don't travel as far when thrown. Same as molotovs.
  - Armor Materials: Tweaks to armor values.
  - Flares: Now actually light up areas around them with minimal performance impact. The original particles are still emitted, and have been optimized to reduce framerate stuttering.
 - Outside of items or blocks, some other functions have changed. Those are:
  - The IW creative tab is no longer sorted. This may be re-implemented in the future, but for now it was disabled to allow Patchouli to add the Encyclopedia to the tab.
  - Configuration files have been modified, again. The server one is now a common config, and registered properly.
  - Lots of advancement changes.
  - Changes to some tags.
  - The logo on the mods list has been updated and fits properly now.
  - The update checker now points to this branch (v1.14.0-update-indev). It will be changed when its ready to merge into the 1.18.x dev branch, and into master.

Hopefully I didn't miss anything. Quite a lot has changed, for the better. It should be generally nicer to play after this.
  • Loading branch information
AnonymousHacker1279 committed Feb 18, 2022
1 parent 4caa698 commit 0e18d3c
Show file tree
Hide file tree
Showing 421 changed files with 11,746 additions and 9,291 deletions.
56 changes: 49 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ repositories {
name "Bai Maven"
url "https://maven.bai.lol"
}
maven {
url 'https://maven.blamejared.com'
}
}

apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'maven-publish'

version = '1.18.1-1.13.0-beta10'
group = 'com.anonymoushacker1279.immersiveweapons'

java.toolchain.languageVersion = JavaLanguageVersion.of(17)

println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft {
mappings channel: 'parchment', version: '2021.12.19-1.18.1'
mappings channel: mappings_channel, version: mappings_version

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

Expand All @@ -51,6 +51,10 @@ minecraft {

property 'forge.logging.console.level', 'debug'

// For Patchouli to work in-dev
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

mods {
immersiveweapons {
source sourceSets.main
Expand All @@ -65,6 +69,10 @@ minecraft {

property 'forge.logging.console.level', 'debug'

// For Patchouli to work in-dev
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

mods {
immersiveweapons {
source sourceSets.main
Expand All @@ -79,6 +87,10 @@ minecraft {

property 'forge.logging.console.level', 'debug'

// For Patchouli to work in-dev
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

args '--mod', 'immersiveweapons', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')

mods {
Expand All @@ -96,13 +108,43 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
dependencies {
implementation 'org.jetbrains:annotations:23.0.0'

minecraft 'net.minecraftforge:forge:1.18.1-39.0.55'
minecraft forge_version

// Include JEI
implementation fg.deobf("mezz.jei:jei-1.18.1:9.2.1.69")
implementation fg.deobf(jei_version)

// Include WTHIT
implementation fg.deobf("mcp.mobius.waila:wthit:forge-4.4.1")
implementation fg.deobf(wthit_version)

// Include Patchouli
compileOnly fg.deobf(patchouli_version + ":api")
runtimeOnly fg.deobf(patchouli_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 intoTargets = ["$rootDir/out/production/resources/", "$rootDir/out/production/${project.name}.main/", "$rootDir/bin/main/"]
def replaceProperties = [build_version: version]
processResources {
inputs.properties replaceProperties
replaceProperties.put 'project', project

filesMatching(resourceTargets) {
expand replaceProperties
}

intoTargets.each { target ->
if (file(target).exists()) {
copy {
from(sourceSets.main.resources) {
include resourceTargets
expand replaceProperties
}
into target
}
}
}
}

// Add properties to JAR manifest
Expand Down
12 changes: 9 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx6G
org.gradle.daemon=true
org.gradle.daemon=true
version=1.18.1-1.14.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
142 changes: 106 additions & 36 deletions src/generated/resources/.cache/cache

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/acacia_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/birch_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/burned_oak_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/crimson_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/dark_oak_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/jungle_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/oak_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/raw_sulfur_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/spruce_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "immersiveweapons:block/warped_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "immersiveweapons:block/raw_sulfur_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/acacia_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/birch_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/burned_oak_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/crimson_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/dark_oak_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/jungle_table"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/oak_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/raw_sulfur_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/spruce_table"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "immersiveweapons:block/warped_table"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"parent": "immersiveweapons:warrior_statue",
"parent": "immersiveweapons:root",
"display": {
"icon": {
"item": "immersiveweapons:azul_keystone"
"item": "minecraft:bamboo"
},
"title": {
"translate": "advancements.immersiveweapons.tiltros.azul_keystone.title"
"translate": "advancements.immersiveweapons.bamboo.title"
},
"description": {
"translate": "advancements.immersiveweapons.tiltros.azul_keystone.description"
"translate": "advancements.immersiveweapons.bamboo.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": true
"hidden": false
},
"criteria": {
"hold": {
Expand All @@ -22,7 +22,7 @@
"items": [
{
"items": [
"immersiveweapons:azul_keystone"
"minecraft:bamboo"
]
}
]
Expand Down

This file was deleted.

Loading

0 comments on commit 0e18d3c

Please sign in to comment.