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

My Changes (Port to 1.18.2 (1.19 TODO)) #17

Draft
wants to merge 16 commits into
base: 1.18
Choose a base branch
from
39 changes: 32 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
plugins {
id 'fabric-loom' version '0.9-SNAPSHOT'
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'maven-publish'
}

minecraft {
accessWidener = file("src/main/resources/camping.accesswidener")
sourceSets {
main {
resources {
srcDirs += [
'src/generated/resources'
]
}
}
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
loom {
accessWidenerPath = file("src/main/resources/camping.accesswidener")
runs {
data {
server()
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}"
// vmArg "-Dfabric-api.datagen.strict-validation"
vmArg "-Dfabric-api.datagen.modid=camping"
ideConfigGenerated = true
runDir "build/datagen"
}
}
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand All @@ -19,6 +41,7 @@ repositories {
name = 'TerraformersMC'
url = 'https://maven.terraformersmc.com/'
}
maven { url = 'https://maven.minecraftforge.net/' }
}

dependencies {
Expand All @@ -28,7 +51,9 @@ dependencies {

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

include modImplementation("com.terraformersmc.terraform-api:terraform-biome-builder-api-v1:2.0.0")

modImplementation 'com.github.glitchfiend:TerraBlender-fabric:1.18.2-1.1.0.95'
//include modImplementation("com.terraformersmc.terraform-api:terraform-biome-builder-api-v1:2.0.0")
}

processResources {
Expand All @@ -41,7 +66,7 @@ processResources {

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 16
it.options.release = 17
}

java {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.39
loader_version=0.11.6
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.2
loader_version=0.13.3

# Mod Properties
mod_version = 1.0.1
mod_version = 1.1.0
maven_group = io.github.simplycmd
archives_base_name = camping

# Dependencies
fabric_version=0.37.2+1.17
fabric_version=0.48.0+1.18.2
96 changes: 96 additions & 0 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
f31737a4f4386eb9e1f81d13fec9838ae93dabec data/camping/recipes/pine_stairs.json
64cd84346a4d434615d184ae48e385fc48433b59 data/camping/loot_tables/blocks/pine_stairs.json
024e9ac4a69f34aad62cdf612be6e61eaaf203ed assets/camping/models/block/pine_stairs_inner.json
e5f28e60a02eff93ce0101dc6917ed48d23da156 assets/camping/models/item/pine_planks.json
ba8f75896d3c22b831f93d8b76362c896f3ef495 data/minecraft/tags/items/wooden_slabs.json
4214d7aeed5ba92d91308303ade7af8c9adb3579 data/minecraft/tags/blocks/fences.json
88bb93c64e566887139c6bda2a8c4b763c8cfba2 assets/camping/models/item/pine_fence.json
1c5aa8217c7bc8e3f1e6a42674af3e971dba9361 data/camping/loot_tables/blocks/pine_pressure_plate.json
10c27ef8570881340590b0fd94356a60911ec8c5 data/camping/loot_tables/blocks/sleeping_bag.json
4b50b961ea92eb50fc9fdc99c8b6ede0bf82b209 data/camping/recipes/oak_boat.json
bcfaef295030a865569c7dcdea62f888c216088e data/camping/advancements/recipes/building_blocks/pine_fence_gate.json
ba8f75896d3c22b831f93d8b76362c896f3ef495 data/minecraft/tags/blocks/slabs.json
4191dcafb5220ba0c0a2cb55636f3f281ed522c0 data/camping/recipes/pine_fence.json
74e41be7a37c1773904306267d8ed55d75543c83 data/camping/advancements/recipes/redstone/pine_pressure_plate.json
ba8f75896d3c22b831f93d8b76362c896f3ef495 data/minecraft/tags/items/slabs.json
ec8cca65cf519b34f28aba0afd71398d7d8aa24d assets/camping/blockstates/pine_slab.json
8fc6a8875010b2db2311ed9737b974be85dbfa42 assets/camping/models/block/pine_fence_post.json
a1c8f51633e375ce591882713c240909af90736e data/minecraft/tags/blocks/signs.json
797184377054e1a481e9191d4e1b839cbc158fe5 data/camping/loot_tables/blocks/pine_fence_gate.json
e3e224774fcfd69f27309ea904094d2cb1ed530a assets/camping/models/item/pine_fence_gate.json
69f75f1ddea99ea0680549165b01ca975a0fec7d data/camping/advancements/recipes/transportation/oak_boat.json
ed6f9f72fb826d13f9b4ecba7fcc0c216af097af assets/camping/models/item/stripped_pine_wood.json
e8b7150aead8bccc14c93eec90a9a6226d82f1f3 assets/camping/models/block/pine_slab_top.json
66e4b8bfdd4c7aeeb7fa5a9bbd36fabca04983eb data/minecraft/tags/blocks/logs.json
73658a56e499864c856d23b335b6e07274fe15dd data/camping/loot_tables/blocks/pine_log.json
edc7ed9bb0ab0d7b8b40a1ce9ef8a656b8dd3027 assets/camping/models/block/pine_fence_gate_open.json
7fb8252020941ab31c37ae1a1e9a7ac1954ee82d data/minecraft/tags/items/signs.json
770f2e1c9fdf3d91352794d6f1cbdce5424f0146 data/minecraft/tags/items/stairs.json
be0cc83cb3bded8adba020c53aaec238ddb36a85 assets/camping/models/item/pine_pressure_plate.json
079d1ffa6ea779ff42694fb8d2fbbc4c611feeae assets/camping/models/block/pine_planks.json
9a761b109952e3a4c6367b0ced36353704fe86c9 data/camping/advancements/recipes/building_blocks/pine_wood.json
2950deacb9ca68884421b68e95e084e12f7e544c data/camping/advancements/recipes/building_blocks/stripped_pine_wood.json
8559a527f021ff2775e90d4b23b81f2d40beacd5 assets/camping/models/block/pine_fence_gate_wall_open.json
1bd2e88dec7d3c4883b7ee859dfc3ab34d84e4b1 data/camping/loot_tables/blocks/stripped_pine_wood.json
3382b033eded1ef3740dced880da727b5e9502e8 data/camping/loot_tables/blocks/pine_slab.json
bdc98bf05616a91c5842c1142cb55fd2af1cc264 assets/camping/models/block/pine_pressure_plate_down.json
66e4b8bfdd4c7aeeb7fa5a9bbd36fabca04983eb data/minecraft/tags/items/logs_that_burn.json
cdc3480a9d09a22fc7435588d598598abe1b6b03 data/camping/recipes/pine_fence_gate.json
71633e53ae21c3d3869a3cd0e32da31a65390c76 data/camping/recipes/pine_sign.json
f123442466ccb31a77398bca82a536789aa4c2e6 assets/camping/models/block/pine_pressure_plate.json
b513bc4e15a2cd96126db15dd12621b17832ce81 data/camping/recipes/pine_slab.json
4214d7aeed5ba92d91308303ade7af8c9adb3579 data/minecraft/tags/blocks/wooden_fences.json
2ef3df82dcae3a4765b8fc686edb6eb64a3e4372 assets/camping/models/block/pine_fence_inventory.json
aa71e0740634e77a8f94a52f9586aee11613cb2d assets/camping/blockstates/stripped_pine_wood.json
32c2073330bc245d6f73d5a9e193620431c965d8 assets/camping/models/block/pine_fence_side.json
bad3a0345016d80b110838ce06115dbe4b5a64a3 data/minecraft/tags/blocks/wooden_pressure_plates.json
d0704c811053491e816efd578342413b6e3540fc assets/camping/models/block/pine_sign.json
852e7e072feb90f192d72d5b5ec7849b5b18e1ac assets/camping/blockstates/pine_fence_gate.json
dea51b5c37964a3515bff528042416c486290c8a assets/camping/models/item/pine_stairs.json
b8a26a60284586f3d25dc011c6e7b094a8562bb0 data/camping/loot_tables/blocks/pine_planks.json
1ebb939909f7bc6b2f0d8bb07a72e9c28549eb58 data/camping/advancements/recipes/building_blocks/pine_fence.json
66e4b8bfdd4c7aeeb7fa5a9bbd36fabca04983eb data/minecraft/tags/items/logs.json
ca01c98b31017693fa3328abcb228a35433a3be0 data/camping/loot_tables/blocks/pine_fence.json
91e927cc1a0179dec0157d664d1b290d32ed62e7 assets/camping/blockstates/pine_wood.json
770f2e1c9fdf3d91352794d6f1cbdce5424f0146 data/minecraft/tags/blocks/wooden_stairs.json
7fb8252020941ab31c37ae1a1e9a7ac1954ee82d data/minecraft/tags/blocks/standing_signs.json
770f2e1c9fdf3d91352794d6f1cbdce5424f0146 data/minecraft/tags/items/wooden_stairs.json
8860be557f41a40e1cbc8907fe592e7f16d6534e assets/camping/blockstates/pine_stairs.json
fbab74bd3a80f86ea2e39f0062a4be3b594dc9fb assets/camping/blockstates/pine_fence.json
c7301baf362d0b23aec448c3fd8d457c2a6f54c0 data/camping/advancements/recipes/decorations/pine_sign.json
12d9b216d09ab182883c11f927aeb0eda582451b data/minecraft/tags/blocks/fence_gates.json
54006b78c3a34dc213996cb93804b8026e4d8350 assets/camping/models/item/pine_sign.json
bc1ef0e377956e6fcd51470a5de5226fc538fcc3 assets/camping/models/block/pine_fence_gate_wall.json
00b2e6a224c4cf1c940f231e0e2cf134a41a1518 assets/camping/models/block/pine_fence_gate.json
1ca4c507202c34ca54652fa892c9edd7cf69f58b data/camping/loot_tables/blocks/pine_wood.json
6b469d8271866f0ad9574d5d825710474c3d8e27 assets/camping/blockstates/pine_pressure_plate.json
b963a48084312144987d2e6ba5dba05e54958e89 data/camping/recipes/stripped_pine_wood.json
5caf7b7f34099b57ccdfc1a20f2d2b506b223e20 data/camping/tags/blocks/pine_logs.json
a1c8f51633e375ce591882713c240909af90736e data/minecraft/tags/blocks/mineable/axe.json
9dbf157a2ef2f84958cf04c837da15c064fb26f3 assets/camping/models/block/pine_wood.json
271cd4dd573368325cf4f179852b76876dd625f1 assets/camping/models/item/pine_wood.json
f6ba60a431122f53ddea3ae5997007f73ad27afe assets/camping/models/block/pine_stairs.json
7514501c78ab08d6ee80377052d66c84b662c844 data/camping/recipes/pine_wood.json
9830eceb975277a577f20a33dab981a750ffb665 data/minecraft/tags/items/planks.json
76f67931cc72bdc6d9e8eb89c0040b0a11bd3f49 data/camping/advancements/recipes/building_blocks/pine_stairs.json
4214d7aeed5ba92d91308303ade7af8c9adb3579 data/minecraft/tags/items/fences.json
9830eceb975277a577f20a33dab981a750ffb665 data/minecraft/tags/blocks/planks.json
5cfbecc4875f7681778b306f6f6a4644353b184d assets/camping/models/block/pine_slab.json
f134efb0db2ea0ad9194311506c9d3d17343c061 data/camping/advancements/recipes/building_blocks/pine_planks.json
4214d7aeed5ba92d91308303ade7af8c9adb3579 data/minecraft/tags/items/wooden_fences.json
02ac4bd2c1f6f4b9fa44a4b0e3992a95384d981f assets/camping/models/block/pine_stairs_outer.json
5caf7b7f34099b57ccdfc1a20f2d2b506b223e20 data/camping/tags/items/pine_logs.json
66e4b8bfdd4c7aeeb7fa5a9bbd36fabca04983eb data/minecraft/tags/blocks/logs_that_burn.json
770f2e1c9fdf3d91352794d6f1cbdce5424f0146 data/minecraft/tags/blocks/stairs.json
e3b1a21038c5f64e294fcee56073a67ac5a63233 data/minecraft/tags/blocks/wall_signs.json
04b8e197d3e8508f5781dc3a6b6a4727ead25e9f assets/camping/models/item/pine_slab.json
c83363308e0404d322b13916dff77f2424daa391 assets/camping/blockstates/pine_sign.json
8d56da1ad3386ea13fcd7b73edd1dd2d5edc60b7 data/camping/recipes/pine_pressure_plate.json
ba8f75896d3c22b831f93d8b76362c896f3ef495 data/minecraft/tags/blocks/wooden_slabs.json
e413f4c91f15c06015bb574d4aaba6ef2da29f87 assets/camping/blockstates/pine_planks.json
c83363308e0404d322b13916dff77f2424daa391 assets/camping/blockstates/pine_wall_sign.json
d5e55b0769a40fdef4847045e931c2a233acea50 assets/camping/models/block/stripped_pine_wood.json
0d0baa4cea72b5400c76f20919461897b4c5fd2c data/camping/loot_tables/blocks/stripped_pine_log.json
bf050170ad2149ca191ce7d20d58353914aa80a1 data/camping/recipes/pine_planks.json
08acef9a2706a6041c7ded79d5f0efcdfb6fd6dc data/camping/advancements/recipes/building_blocks/pine_slab.json
bad3a0345016d80b110838ce06115dbe4b5a64a3 data/minecraft/tags/items/wooden_pressure_plates.json
48 changes: 48 additions & 0 deletions src/generated/resources/assets/camping/blockstates/pine_fence.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"multipart": [
{
"apply": {
"model": "camping:block/pine_fence_post"
}
},
{
"when": {
"north": "true"
},
"apply": {
"model": "camping:block/pine_fence_side",
"uvlock": true
}
},
{
"when": {
"east": "true"
},
"apply": {
"model": "camping:block/pine_fence_side",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "true"
},
"apply": {
"model": "camping:block/pine_fence_side",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "true"
},
"apply": {
"model": "camping:block/pine_fence_side",
"y": 270,
"uvlock": true
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"variants": {
"facing=east,in_wall=false,open=false": {
"uvlock": true,
"y": 270,
"model": "camping:block/pine_fence_gate"
},
"facing=east,in_wall=false,open=true": {
"uvlock": true,
"y": 270,
"model": "camping:block/pine_fence_gate_open"
},
"facing=east,in_wall=true,open=false": {
"uvlock": true,
"y": 270,
"model": "camping:block/pine_fence_gate_wall"
},
"facing=east,in_wall=true,open=true": {
"uvlock": true,
"y": 270,
"model": "camping:block/pine_fence_gate_wall_open"
},
"facing=north,in_wall=false,open=false": {
"uvlock": true,
"y": 180,
"model": "camping:block/pine_fence_gate"
},
"facing=north,in_wall=false,open=true": {
"uvlock": true,
"y": 180,
"model": "camping:block/pine_fence_gate_open"
},
"facing=north,in_wall=true,open=false": {
"uvlock": true,
"y": 180,
"model": "camping:block/pine_fence_gate_wall"
},
"facing=north,in_wall=true,open=true": {
"uvlock": true,
"y": 180,
"model": "camping:block/pine_fence_gate_wall_open"
},
"facing=south,in_wall=false,open=false": {
"uvlock": true,
"model": "camping:block/pine_fence_gate"
},
"facing=south,in_wall=false,open=true": {
"uvlock": true,
"model": "camping:block/pine_fence_gate_open"
},
"facing=south,in_wall=true,open=false": {
"uvlock": true,
"model": "camping:block/pine_fence_gate_wall"
},
"facing=south,in_wall=true,open=true": {
"uvlock": true,
"model": "camping:block/pine_fence_gate_wall_open"
},
"facing=west,in_wall=false,open=false": {
"uvlock": true,
"y": 90,
"model": "camping:block/pine_fence_gate"
},
"facing=west,in_wall=false,open=true": {
"uvlock": true,
"y": 90,
"model": "camping:block/pine_fence_gate_open"
},
"facing=west,in_wall=true,open=false": {
"uvlock": true,
"y": 90,
"model": "camping:block/pine_fence_gate_wall"
},
"facing=west,in_wall=true,open=true": {
"uvlock": true,
"y": 90,
"model": "camping:block/pine_fence_gate_wall_open"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "camping:block/pine_planks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"powered=false": {
"model": "camping:block/pine_pressure_plate"
},
"powered=true": {
"model": "camping:block/pine_pressure_plate_down"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "camping:block/pine_sign"
}
}
}
13 changes: 13 additions & 0 deletions src/generated/resources/assets/camping/blockstates/pine_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "camping:block/pine_slab"
},
"type=double": {
"model": "camping:block/pine_planks"
},
"type=top": {
"model": "camping:block/pine_slab_top"
}
}
}
Loading