Skip to content

Commit 5f62320

Browse files
zKrylezKryle
committed
Well basically bump up to alpha 10 ;)
1 parent 7fa6bb5 commit 5f62320

File tree

308 files changed

+4917
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+4917
-559
lines changed

‎build.gradle

+20-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@ buildscript {
1111
classpath 'org.parchmentmc:librarian:1.+'
1212
}
1313
}
14+
15+
plugins{
16+
id 'java'
17+
id 'com.github.johnrengelman.shadow' version '7.1.2'
18+
}
19+
1420
apply plugin: 'net.minecraftforge.gradle'
1521
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
1622
apply plugin: 'org.parchmentmc.librarian.forgegradle'
1723
apply plugin: 'eclipse'
1824
apply plugin: 'maven-publish'
1925

20-
version = '1.18-1.0.0-alpha-1'
26+
version = '1.18.1-1.0.0-alpha-10'
2127
group = 'me.gleep.oreganized' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2228
archivesBaseName = 'oreganized'
2329

@@ -37,9 +43,11 @@ minecraft {
3743
//
3844
// Use non-default mappings at your own risk. They may not always work.
3945
// Simply re-run your setup task after changing the mappings to update your workspace.
40-
//mappings channel: 'parchment', version: '2021.10.31-1.17.1'
41-
mappings channel: 'official', version: '1.18'
46+
//
47+
// Official Mappings:
48+
// mappings channel: 'official', version: '1.18'
4249

50+
mappings channel: 'parchment', version: '2021.12.19-1.18.1'
4351

4452
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
4553

@@ -136,13 +144,13 @@ dependencies {
136144
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
137145
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
138146
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
139-
minecraft 'net.minecraftforge:forge:1.18-38.0.17'
147+
minecraft 'net.minecraftforge:forge:1.18.1-39.0.64'
140148

141149
// Real mod deobf dependency examples - these get remapped to your current mappings
142150
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
143151
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
144152
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
145-
implementation fg.deobf("com.zkryle:coopperativelib-1.18:1.0")
153+
implementation fg.deobf("com.zkryle:coopperativelib-1.18:1.1")
146154
// Examples using mod jars from ./libs
147155
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
148156

@@ -151,6 +159,13 @@ dependencies {
151159
// http://www.gradle.org/docs/current/userguide/dependency_management.html
152160
}
153161

162+
// Example for how to get properties into the manifest for reading at runtime.
163+
164+
// Example configuration to allow publishing using the maven-publish plugin
165+
// This is the preferred method to reobfuscate your jar file
166+
jar.finalizedBy('reobfJar')
167+
168+
154169
// Example for how to get properties into the manifest for reading at runtime.
155170
jar {
156171
manifest {

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210909000652+0000-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
5+
zipStorePath=wrapper/dists

‎src/generated/resources/.cache/cache

+190
Large diffs are not rendered by default.

‎src/generated/resources/assets/oreganized/blockstates/chiseled_glance.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "oreganized:block/chiseled_glance"
5+
}
6+
}
7+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_cut_copper.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_cut_copper",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_cut_copper_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_cut_copper_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_cut_copper"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_deepslate_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_deepslate_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_deepslate_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_deepslate_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_deepslate_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_end_stone_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_end_stone_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_end_stone_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_end_stone_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_end_stone_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_exposed_cut_copper.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_exposed_cut_copper",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_exposed_cut_copper_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_exposed_cut_copper_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_exposed_cut_copper"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_glance_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_glance_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_glance_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_glance_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_glance_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_nether_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_nether_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_nether_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_nether_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_nether_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_oxidized_cut_copper.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_oxidized_cut_copper",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_oxidized_cut_copper_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_oxidized_cut_copper_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_oxidized_cut_copper"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_polished_blackstone_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_polished_blackstone_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_polished_blackstone_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_polished_blackstone_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_polished_blackstone_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_prismarine_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_prismarine_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_prismarine_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_prismarine_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_prismarine_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_quartz_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_quartz_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_deepslate_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_deepslate_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_quartz_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_red_nether_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_red_nether_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_red_nether_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_red_nether_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_red_nether_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_stone_bricks.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_stone_bricks",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_stone_bricks_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_stone_bricks_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_stone_bricks"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_waxed_cut_copper.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_cut_copper",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_cut_copper_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_cut_copper_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_cut_copper"
16+
}
17+
}
18+
}

‎src/generated/resources/assets/oreganized/blockstates/engraved_waxed_exposed_cut_copper.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"variants": {
3+
"iszaxisdown=false,iszaxisup=false": {
4+
"model": "oreganized:block/engraved_exposed_cut_copper",
5+
"y": 90
6+
},
7+
"iszaxisdown=true,iszaxisup=false": {
8+
"model": "oreganized:block/engraved_exposed_cut_copper_rotated_bottom",
9+
"y": 90
10+
},
11+
"iszaxisdown=false,iszaxisup=true": {
12+
"model": "oreganized:block/engraved_exposed_cut_copper_rotated_bottom"
13+
},
14+
"iszaxisdown=true,iszaxisup=true": {
15+
"model": "oreganized:block/engraved_exposed_cut_copper"
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)