Skip to content

Commit

Permalink
1.20.1
Browse files Browse the repository at this point in the history
6.3

Adds support for Blockus & EldritchEnd
Reformated lots of code
Tidied up very messy datagen.
Compressed some more textures.
  • Loading branch information
xanthian committed Nov 12, 2023
1 parent 3f391a8 commit 00aea02
Show file tree
Hide file tree
Showing 203 changed files with 3,070 additions and 782 deletions.
16 changes: 0 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,3 @@
</p>


## MIT License

Copyright (c) 2023 Xanthian

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
43 changes: 26 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ dependencies {
//modApi ("curse.maven:resourcefulconfig-714059:4576456")

// Beach Party (Lets Do)
modRuntimeOnly("curse.maven:beachparty-858691:4696068") {transitive false}
modRuntimeOnly("curse.maven:beachparty-858691:4696068") { transitive false }

// BetterArcheology
modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") { transitive false }

// Bewitchment
modRuntimeOnly("curse.maven:bewitchment-394915:4673611")
Expand All @@ -88,47 +88,56 @@ dependencies {
modApi("com.jamieswhiteshirt:reach-entity-attributes:2.4.0")
modApi("com.github.emilyploszaj:step-height-entity-attribute:v1.2.0")
modApi("com.terraformersmc.terraform-api:terraform-wood-api-v1:7.0.1")
modRuntimeOnly ("vazkii.patchouli:Patchouli:1.20.1-80-FABRIC")
modRuntimeOnly("com.github.Virtuoel:Pehkui:3.7.6") {transitive false}
modRuntimeOnly("vazkii.patchouli:Patchouli:1.20.1-80-FABRIC")
modRuntimeOnly("com.github.Virtuoel:Pehkui:3.7.6") { transitive false }
modApi("com.github.Virtuoel:KanosConfig:0.4.1")
modRuntimeOnly("curse.maven:trinkets-341284:4657534") {transitive false}
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1")
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1")
modRuntimeOnly("curse.maven:trinkets-341284:4657534") { transitive false }
modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1")
modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1")

// Blockus
modRuntimeOnly("curse.maven:blockus-312289:4745041") { transitive false }

// Deeper & Darker - (some sht about CustomPortalBlocks)
//modRuntimeOnly("curse.maven:deeperdarker-659011:4715721") {transitive false}
//modRuntimeOnly("curse.maven:deeperdarker-659011:4838841") {transitive false}

// Eldritch End
modRuntimeOnly("curse.maven:eldritch_end-877553:4846136") { transitive false }
modApi("curse.maven:azure_lib-817423:4829197")
modApi("curse.maven:necronomicon-586157:4834773")

// MineCells
modRuntimeOnly("curse.maven:minecells-618790:4745169") {transitive false}
modRuntimeOnly("curse.maven:minecells-618790:4745169") { transitive false }
modApi("io.wispforest:owo-lib:0.11.2-pre.11+1.20")
modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")

// Natures Spirit - (terrablender mess)
//modRuntimeOnly ("maven.modrinth:natures-spirit:1.0")
//modRuntimeOnly ("maven.modrinth:natures-spirit:1.1.1")
//modRuntimeOnly("com.github.Team-Hibiscus:NatureSpirit:v2")

// Promenade
modRuntimeOnly("curse.maven:promenade-399648:4611967") {transitive false}
modRuntimeOnly("curse.maven:promenade-399648:4611967") { transitive false }
modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
modApi("com.terraformersmc:biolith:1.0.0-alpha.7")

// Regions Unexplored
modRuntimeOnly("curse.maven:regions_unexplored-659110:4721079")
modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.0.169")
//modApi ("curse.maven:terrablender-565956:4573002")
modApi ("com.github.Lortseam.completeconfig:base:2.5.0")
modApi("com.github.Lortseam.completeconfig:base:2.5.0")

// Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto)
//modRuntimeOnly("curse.maven:hellionssiffer-871962:4591532")

// Tech Reborn
modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") {transitive false }
modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") { transitive false }
modRuntimeOnly("RebornCore:RebornCore-1.20:5.8.3")

// Vinery
modRuntimeOnly("curse.maven:vinery-704465:4643442") {transitive false}
modRuntimeOnly ("maven.modrinth:do-api:1.2.4-fabric") {transitive false}
modApi( "curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
modRuntimeOnly("curse.maven:vinery-704465:4643442") { transitive false }
modRuntimeOnly("maven.modrinth:do-api:1.2.4-fabric") { transitive false }
modApi("curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }

}

processResources {
Expand All @@ -151,7 +160,7 @@ java {

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.archivesBaseName}" }
}
}

Expand Down
9 changes: 3 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.14.22

loader_version=0.14.24
#Fabric api
fabric_version=0.88.1+1.20.1

fabric_version=0.90.7+1.20.1
# Mod Properties
mod_version=6.2
mod_version=6.3
maven_group=xanthian
archives_base_name=variantcraftingtables
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_charred_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_birch_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_charred_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_cherry_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_crimson_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_dark_oak_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_jungle_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_mangrove_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_oak_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_raw_bamboo_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_spruce_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_warped_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_herringbone_white_oak_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_raw_bamboo_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/bls_white_oak_crafting_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "variantcraftingtables:block/ee_primordial_crafting_table"
}
}
}
41 changes: 29 additions & 12 deletions src/main/generated/assets/variantcraftingtables/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,41 @@
{
"block.minecraft.crafting_table": "Oak Crafting Table",
"block.variantcraftingtables.aa_aeronos_crafting_table": "Aeronos Crafting Table",
"block.variantcraftingtables.aa_glacian_crafting_table": "Glacian Crafting Table",
"block.variantcraftingtables.aa_strophar_crafting_table": "Strophar Crafting Table",
"block.variantcraftingtables.acacia_crafting_table": "Acacia Crafting Table",
"block.variantcraftingtables.acacia_crafting_table": "Crafting Table",
"block.variantcraftingtables.ba_rotten_crafting_table": "Rotten Crafting Table",
"block.variantcraftingtables.bamboo_crafting_table": "Bamboo Crafting Table",
"block.variantcraftingtables.birch_crafting_table": "Birch Crafting Table",
"block.variantcraftingtables.bamboo_crafting_table": "Crafting Table",
"block.variantcraftingtables.birch_crafting_table": "Crafting Table",
"block.variantcraftingtables.bls_charred_crafting_table": "Charred Crafting Table",
"block.variantcraftingtables.bls_herringbone_acacia_crafting_table": "Herringbone Acacia Crafting Table",
"block.variantcraftingtables.bls_herringbone_bamboo_crafting_table": "Herringbone Bamboo Crafting Table",
"block.variantcraftingtables.bls_herringbone_birch_crafting_table": "Herringbone Birch Crafting Table",
"block.variantcraftingtables.bls_herringbone_charred_crafting_table": "Herringbone Charred Crafting Table",
"block.variantcraftingtables.bls_herringbone_cherry_crafting_table": "Herringbone Cherry Crafting Table",
"block.variantcraftingtables.bls_herringbone_crimson_crafting_table": "Herringbone Crimson Crafting Table",
"block.variantcraftingtables.bls_herringbone_dark_oak_crafting_table": "Herringbone Dark Oak Crafting Table",
"block.variantcraftingtables.bls_herringbone_jungle_crafting_table": "Herringbone Jungle Crafting Table",
"block.variantcraftingtables.bls_herringbone_mangrove_crafting_table": "Herringbone Mangrove Crafting Table",
"block.variantcraftingtables.bls_herringbone_oak_crafting_table": "Herringbone Oak Crafting Table",
"block.variantcraftingtables.bls_herringbone_raw_bamboo_crafting_table": "Herringbone Raw Bamboo Crafting Table",
"block.variantcraftingtables.bls_herringbone_spruce_crafting_table": "Herringbone Spruce Crafting Table",
"block.variantcraftingtables.bls_herringbone_warped_crafting_table": "Herringbone Warped Crafting Table",
"block.variantcraftingtables.bls_herringbone_white_oak_crafting_table": "Herringbone White Oak Crafting Table",
"block.variantcraftingtables.bls_raw_bamboo_crafting_table": "Raw Bamboo Crafting Table",
"block.variantcraftingtables.bls_white_oak_crafting_table": "White Oak Crafting Table",
"block.variantcraftingtables.bw_cypress_crafting_table": "Cypress Crafting Table",
"block.variantcraftingtables.bw_dragons_blood_crafting_table": "Dragon's Blood Crafting Table",
"block.variantcraftingtables.bw_dragons_blood_crafting_table": "Dragons Blood Crafting Table",
"block.variantcraftingtables.bw_elder_crafting_table": "Elder Crafting Table",
"block.variantcraftingtables.bw_juniper_crafting_table": "Juniper Crafting Table",
"block.variantcraftingtables.cherry_crafting_table": "Cherry Crafting Table",
"block.variantcraftingtables.crimson_crafting_table": "Crimson Crafting Table",
"block.variantcraftingtables.cherry_crafting_table": "Crafting Table",
"block.variantcraftingtables.crimson_crafting_table": "Crafting Table",
"block.variantcraftingtables.dad_echo_crafting_table": "Echo Crafting Table",
"block.variantcraftingtables.dark_oak_crafting_table": "Dark Oak Crafting Table",
"block.variantcraftingtables.jungle_crafting_table": "Jungle Crafting Table",
"block.variantcraftingtables.dark_oak_crafting_table": "Oak Crafting Table",
"block.variantcraftingtables.ee_primordial_crafting_table": "Primordial Crafting Table",
"block.variantcraftingtables.jungle_crafting_table": "Crafting Table",
"block.variantcraftingtables.ldbp_palm_crafting_table": "Palm Crafting Table",
"block.variantcraftingtables.ldv_cherry_crafting_table": "Cherry Crafting Table",
"block.variantcraftingtables.mangrove_crafting_table": "Mangrove Crafting Table",
"block.variantcraftingtables.mangrove_crafting_table": "Crafting Table",
"block.variantcraftingtables.mc_putrid_crafting_table": "Putrid Crafting Table",
"block.variantcraftingtables.ns_aspen_crafting_table": "Aspen Crafting Table",
"block.variantcraftingtables.ns_cypress_crafting_table": "Cypress Crafting Table",
Expand Down Expand Up @@ -73,7 +90,7 @@
"block.variantcraftingtables.ru_yellow_bioshroom_crafting_table": "Yellow Bioshroom Crafting Table",
"block.variantcraftingtables.ru_yellow_painted_crafting_table": "Yellow Painted Crafting Table",
"block.variantcraftingtables.sp_stone_pine_crafting_table": "Stone Pine Crafting Table",
"block.variantcraftingtables.spruce_crafting_table": "Spruce Crafting Table",
"block.variantcraftingtables.spruce_crafting_table": "Crafting Table",
"block.variantcraftingtables.tr_rubber_crafting_table": "Rubber Crafting Table",
"block.variantcraftingtables.warped_crafting_table": "Warped Crafting Table"
"block.variantcraftingtables.warped_crafting_table": "Crafting Table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"down": "blockus:block/charred_planks",
"east": "variantcraftingtables:block/bls_charred_crafting_table_side",
"north": "variantcraftingtables:block/bls_charred_crafting_table_front",
"particle": "variantcraftingtables:block/bls_charred_crafting_table_front",
"south": "variantcraftingtables:block/bls_charred_crafting_table_side",
"up": "variantcraftingtables:block/bls_charred_crafting_table_top",
"west": "variantcraftingtables:block/bls_charred_crafting_table_front"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"down": "blockus:block/herringbone_acacia_planks",
"east": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_side",
"north": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_front",
"particle": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_front",
"south": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_side",
"up": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_top",
"west": "variantcraftingtables:block/bls_herringbone_acacia_crafting_table_front"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"down": "blockus:block/herringbone_bamboo_planks",
"east": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_side",
"north": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_front",
"particle": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_front",
"south": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_side",
"up": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_top",
"west": "variantcraftingtables:block/bls_herringbone_bamboo_crafting_table_front"
}
}
Loading

0 comments on commit 00aea02

Please sign in to comment.