Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.18 #372

Merged
merged 96 commits into from
Dec 30, 2021
Merged

1.18 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
a4f26e8
Gradle changes
paulevsGitch Dec 4, 2021
c88745c
gradlew update to 7.3
quiqueck Dec 4, 2021
f16f116
version updates
quiqueck Dec 4, 2021
6671b43
pull loom version to ptoperties
quiqueck Dec 4, 2021
c2ca3f3
Fixed deprecated property
quiqueck Dec 4, 2021
2367b5d
Partial API calls fixes
paulevsGitch Dec 5, 2021
823108a
Gradle change
paulevsGitch Dec 5, 2021
6a6f29b
Feature API usage
paulevsGitch Dec 5, 2021
64de980
Some feature pieces fixes, changed API calls
paulevsGitch Dec 5, 2021
96c65b7
fixed liquid tick call
quiqueck Dec 7, 2021
016a304
Converted Biome generation to new BCLib builder
quiqueck Dec 7, 2021
6a8ad29
BYG-Integration compile fixes
quiqueck Dec 7, 2021
6097311
Adapted Feature Classes
quiqueck Dec 7, 2021
dca9f84
More compiler fixes
quiqueck Dec 7, 2021
78cc829
removed reading of top/under/underwater material for now
quiqueck Dec 7, 2021
108d2bd
Fixed compiler errors for REI
quiqueck Dec 7, 2021
6c89c76
Fixed all remaining compile errors (mind the TODOs, a lot of things a…
quiqueck Dec 7, 2021
6b63be3
Fixed some bootup errors
quiqueck Dec 7, 2021
fb422d0
Make sure enderman ar default spawns
quiqueck Dec 8, 2021
a966671
disabled Patchouli until they release a 1.18 version
quiqueck Dec 8, 2021
4ff84c5
Library update
paulevsGitch Dec 8, 2021
396eb27
Mixin fix
quiqueck Dec 8, 2021
b5b8963
Minor cleanup
quiqueck Dec 8, 2021
5affe91
Merge branch '1.18' of gh.neting.cc-quiqueck:paulevsGitch/BetterEnd int…
quiqueck Dec 8, 2021
df68456
Fixed call
quiqueck Dec 8, 2021
2c5c030
Added BiomeTest to feature placers
quiqueck Dec 8, 2021
1c79354
Removed double features
quiqueck Dec 8, 2021
e8a4024
Example implementation of custom noise for SurfaceRules
quiqueck Dec 8, 2021
338aee7
cache last noise result for rule sequences
quiqueck Dec 8, 2021
5c12813
Fixed surface gen in UmbraValleyBiome
quiqueck Dec 8, 2021
633c5ad
Add info about top/underMaterial to BE-biomes
quiqueck Dec 8, 2021
2a0f58a
Fixed surface block setting
quiqueck Dec 8, 2021
ef025d0
Fixed BCLib compat
quiqueck Dec 9, 2021
514749d
Another BCLib compat fix
quiqueck Dec 9, 2021
520fca6
reenabled feature add
quiqueck Dec 9, 2021
33d8fe8
Updated fabric loader
quiqueck Dec 9, 2021
ef02d0e
Removed tested ToDo's
quiqueck Dec 9, 2021
a27f3e3
top Material handling
quiqueck Dec 9, 2021
f731351
Fixed build errors
quiqueck Dec 9, 2021
d11dc97
Version update
quiqueck Dec 10, 2021
70e7071
New location for parent class
quiqueck Dec 13, 2021
ce727b2
Updated version
quiqueck Dec 14, 2021
65dd58d
Migrated to SurfaceBuilder
quiqueck Dec 15, 2021
71ecd6d
Exclude *the_void* biome
quiqueck Dec 15, 2021
1593e7d
Fixed priorities in SurfaceRules
quiqueck Dec 15, 2021
19b48a8
Use LifeCycle API
quiqueck Dec 15, 2021
784834a
Make sure we set the distance as a square
quiqueck Dec 15, 2021
ae755a6
Library update
paulevsGitch Dec 15, 2021
e019dc2
Loader update
quiqueck Dec 15, 2021
b624693
Merge branch '1.18' of gh.neting.cc-quiqueck:paulevsGitch/BetterEnd int…
quiqueck Dec 15, 2021
dd1ef90
Dependency update
quiqueck Dec 15, 2021
e4d534d
Small distance fix
paulevsGitch Dec 15, 2021
5460ccb
Average depth getter
paulevsGitch Dec 15, 2021
934efc9
Land generator (WIP)
paulevsGitch Dec 16, 2021
fb19abd
Library update
paulevsGitch Dec 16, 2021
c515c3c
Library integration update
paulevsGitch Dec 16, 2021
ce88ec2
Terrain generator (WIP)
paulevsGitch Dec 18, 2021
4256e95
Terrain generator fixes
paulevsGitch Dec 18, 2021
91e7bab
Library update
paulevsGitch Dec 21, 2021
58310d0
Replaced spaces, proper biome getter, imports cleanup
paulevsGitch Dec 21, 2021
c2ab690
End city new random
paulevsGitch Dec 21, 2021
6840225
Updated Enderscape integration
paulevsGitch Dec 21, 2021
1300e1a
Cave feature adding fix
paulevsGitch Dec 21, 2021
1c43af9
Merge branch '1.18' of github.com:paulevsGitch/BetterEnd into 1.18
quiqueck Dec 21, 2021
2f490fa
Lib update, ability to use local jars fom libs folder
paulevsGitch Dec 23, 2021
5585d89
Umbra valley filler & arches fixes
paulevsGitch Dec 23, 2021
064c850
Plant distribution fix
paulevsGitch Dec 23, 2021
5f516ac
Lake generation fixes
paulevsGitch Dec 23, 2021
800bf72
Feature fixes
paulevsGitch Dec 23, 2021
2c81907
Biome setting in caves
paulevsGitch Dec 23, 2021
6bd2a08
Cave floor generation
paulevsGitch Dec 23, 2021
d0b23a9
Tunnel caves fixes
paulevsGitch Dec 23, 2021
affd636
Tree fixes
paulevsGitch Dec 23, 2021
54258d3
Erosion with fixes
paulevsGitch Dec 23, 2021
35f9cd8
Biome features
paulevsGitch Dec 23, 2021
a4ec452
Ore fix, amber lands re-balance
paulevsGitch Dec 23, 2021
c81e072
Blossoming Spires re-balance
paulevsGitch Dec 23, 2021
a25a025
Chorus Forest re-balance
paulevsGitch Dec 23, 2021
a5e203a
Sulphur Springs fixes
paulevsGitch Dec 23, 2021
7ab1d69
Shadow Forest re-balance
paulevsGitch Dec 23, 2021
bf49333
Dust Wastelands dust depth
paulevsGitch Dec 23, 2021
b6e87d9
New logo
paulevsGitch Dec 25, 2021
f668a3b
Mod json changes
paulevsGitch Dec 25, 2021
a307cb7
Neon Oasis surface fix
paulevsGitch Dec 25, 2021
ce11929
Biome formatting fix
paulevsGitch Dec 25, 2021
87c37f1
Mosses & glowshrooms count re-balance
paulevsGitch Dec 25, 2021
1ae6d0d
Partial pedestals fix
paulevsGitch Dec 28, 2021
30046b2
Pedestals entity fix
paulevsGitch Dec 28, 2021
2f70188
Small crystal rendering fixes
paulevsGitch Dec 28, 2021
023708f
Island feature restored (ritual)
paulevsGitch Dec 28, 2021
25f4dc0
Library update
paulevsGitch Dec 29, 2021
d0f2e6c
Fixed textures wrong pixels
paulevsGitch Dec 30, 2021
789f1cc
Fixed glass in structure
paulevsGitch Dec 30, 2021
57641fe
Structures loot, Umbrella Jungle features rebalance
paulevsGitch Dec 30, 2021
2c5f428
Biome structure loot, texture fixes
paulevsGitch Dec 30, 2021
5bd0fc4
Removed debug string
paulevsGitch Dec 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ output/
*.getBlock("log")
Convert.class
ModelPart.class
libs/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

# Better End

Better End Mod for Fabric, MC 1.17.1
Better End Mod for Fabric, MC 1.18

Importing:

* Clone repo
* Edit gradle.properties if necessary
* Run command line in folder: gradlew genSources eclipse (or Another-IDE-Name)
* Run command line in folder: gradlew genSources idea (or eclipse)
* Import project to IDE

Building:
Expand Down
18 changes: 13 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ buildscript {
plugins {
id 'idea'
id 'eclipse'
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version "${loom_version}"
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand All @@ -25,15 +25,23 @@ repositories {
maven { url 'https://maven.blamejared.com' }
maven { url "https://maven.shedaniel.me/" }
maven { url 'https://jitpack.io' }
maven { url 'https://maven.terraformersmc.com/releases' }
flatDir {
dirs 'libs'
}
}

loom {
accessWidenerPath = file("src/main/resources/betterend.accesswidener")
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings minecraft.officialMojangMappings()
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

useApi "vazkii.patchouli:Patchouli:1.17-${project.patchouli_version}"
// useApi "vazkii.patchouli:Patchouli:1.17-${project.patchouli_version}"
println "Using local BCLib: ${local_bclib}"
if (local_bclib){
implementation( project(path:":BCLib", configuration: 'dev') )
Expand Down
18 changes: 11 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17.1
yarn_mappings=6
loader_version=0.12.4
minecraft_version=1.18.1
fabric_version = 0.44.0+1.18
loader_version=0.12.12

#Loom
loom_version=0.10-SNAPSHOT

# Mod Properties
mod_version=0.12.5
mod_version=1.0.0
maven_group=ru.betterend
archives_base_name=better-end

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api

patchouli_version = 55-FABRIC-SNAPSHOT
fabric_version = 0.42.1+1.17
bclib_version = 0.5.4
rei_version = 6.0.264-alpha
bclib_version = 1.2.0
rei_version = 7.0.343
canvas_version = 1.0.+
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading