Skip to content

Commit c07939c

Browse files
XaideeXaidee
committed
Yay, finally a stable Forge version.
Revamped mods.toml, build.gradle, and README.md
1 parent 9fdc5d2 commit c07939c

Some content is hidden

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

54 files changed

+259
-275
lines changed

‎README.md

+31-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
1-
# oreganized
2-
Oreganized Mod which expands ores and other items in vanilla minecraft
1+
<p align="center">
2+
<img src="https://i.imgur.com/ptOIvrD.png">
3+
</p>
34

4-
**Currently added**
5-
- Silver Ore
6-
- Can be mined with iron pickaxe or higher
7-
- Generates naturally between level 30 and 40 with maximum vein size 3
8-
- Silver Block
9-
- Can be mined with iron pickaxe or higher
10-
- Craftable as normal blocks (9 silver ingots)
11-
- Silver Ingot
12-
- Obtained when smelted silver ore in furnace or blast furnace
13-
- Craftable from silver nuggets (1 silver block => 9 silver ingots)
14-
- Silver Nugget
15-
- Craftable from silver ingot (1 silver ingot => 9 silver nuggets and backwards)
16-
- Silver Tinted (Golden, Diamond, Netherite) Sword
17-
- Max 5% uses (Gold - 2, Diamond - about 80, Netherite - 102) from the original sword then the tint breaks
18-
- Recieve a little experience when hitting undead mob
19-
- Silver Tinted (Golden, Diamond, Netherite) Armor
20-
- *Currently no feature added*
21-
- Netherite nugget
22-
- Craftable from netherite ingot (1 netherite ingot => 9 netherite nuggets and backwards)
23-
- Lead Ore
24-
- Generates naturally between level 50 and 70 with maximum vein size 12
25-
- Lead Ingot
26-
- Lead Nugget
5+
<p align="center">
6+
7+
<a href="https://discord.gg/sA858vGruu">
8+
<img alt="Discord" src="https://img.shields.io/discord/780149719611473930?color=ff8c5a&label=%20&labelColor=525474&logoColor=white&style=for-the-badge&logo=discord">
9+
</a>
10+
11+
<a href="https://www.curseforge.com/minecraft/mc-mods/oreganized">
12+
<img alt="CurseForge" src="https://img.shields.io/badge/Curseforge-Team_Galena?label=&color=ff8c5a&labelColor=525474&style=for-the-badge&logo=Curseforge&logoColor=white">
13+
</a>
14+
15+
<a href="https://twitter.com/Oreganized_mod">
16+
<img alt="Twitter" src="https://img.shields.io/twitter/follow/Oreganized_mod?label=&color=ff8c5a&labelColor=525474&style=for-the-badge&logo=Twitter&logoColor=white">
17+
</a>
18+
19+
<a href="https://twitter.com/Oreganized_mod">
20+
<img alt="Patreon" src="https://img.shields.io/badge/Patreon-Team_Galena?label=&color=ff8c5a&labelColor=525474&style=for-the-badge&logo=Patreon&logoColor=white">
21+
</a>
22+
</p>
23+
24+
Oreganized is a mod focusing on adding new ores and metals to Minecraft. Currently it adds, Lead and Silver as base metals and a new alloy known as Electrum.
25+
26+
This mod is designed to be a Vanilla plus mod while also adding unique uses and abilities to its content rather than just meaningless toolsets for a more engaging experience that tries to match the quality of Mojang's own implementations of new content.
27+
28+
<p align="center">
29+
<a href="https://www.akliz.net/galena">
30+
<img alt="Akliz" src="https://i.imgur.com/aD9X866.png">
31+
</a>
32+
</p>

‎build.gradle

+69-86
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,135 @@
11
buildscript {
22
repositories {
33
maven { url = 'https://maven.minecraftforge.net' }
4+
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
45
mavenCentral()
5-
maven { url='https://repo.spongepowered.org/repository/maven-public/' }
6-
maven { url = 'https://maven.parchmentmc.org' }
76
}
87
dependencies {
9-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
10-
classpath 'org.spongepowered:mixingradle:0.7.+'
11-
classpath 'org.parchmentmc:librarian:1.+'
8+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forgegradle_version}", changing: true
9+
classpath "org.spongepowered:mixingradle:${mixingradle_version}"
1210
}
1311
}
1412

13+
apply plugin: 'java'
1514
apply plugin: 'net.minecraftforge.gradle'
16-
//
1715
apply plugin: 'eclipse'
18-
apply plugin: 'maven-publish'
1916
apply plugin: 'org.spongepowered.mixin'
20-
apply plugin: 'org.parchmentmc.librarian.forgegradle'
17+
apply plugin: 'maven-publish'
18+
19+
archivesBaseName = "${mod_name} ${minecraft_version}-"
20+
21+
mixin {
22+
add sourceSets.main, "${mod_id}.refmap.json"
2123

22-
version = project.oreganized_version
23-
group = 'galena.oreganized.modid'
24-
archivesBaseName = 'Oreganized-'+project.mc_version
24+
config "${mod_id}.mixins.json"
25+
}
2526

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

2829
minecraft {
29-
// The mappings can be changed at any time and must be in the following format.
30-
// Channel: Version:
31-
// official MCVersion Official field/method names from Mojang mapping files
32-
// parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official
33-
//
34-
// You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
35-
// See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
36-
//
37-
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
38-
// Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
39-
//
40-
// Use non-default mappings at your own risk. They may not always work.
41-
// Simply re-run your setup task after changing the mappings to update your workspace.
42-
mappings channel: 'official', version: '1.19'
30+
mappings channel: 'official', version: minecraft_version
31+
32+
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
4333

4434
runs {
4535
client {
4636
workingDirectory project.file('run')
47-
48-
//arg "-mixin.config=oreganized.mixins.json" // For if organized ever needs mixins
49-
50-
//property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
51-
//property 'forge.logging.console.level', 'debug'
52-
37+
ideaModule "${rootProject.name}.${project.name}.main"
38+
taskName 'Client'
39+
args "-mixin.config=${mod_id}.mixins.json"
5340
mods {
54-
oreganized {
41+
modClientRun {
5542
source sourceSets.main
5643
}
5744
}
5845
}
5946

6047
server {
6148
workingDirectory project.file('run')
62-
63-
//arg "-mixin.config=oreganized.mixins.json" // For if organized ever needs mixins
64-
65-
//property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
66-
//property 'forge.logging.console.level', 'debug'
67-
49+
ideaModule "${rootProject.name}.${project.name}.main"
50+
taskName 'Server'
51+
args "-mixin.config=${mod_id}.mixins.json"
6852
mods {
69-
oreganized {
53+
modServerRun {
7054
source sourceSets.main
7155
}
7256
}
7357
}
7458

7559
data {
7660
workingDirectory project.file('run')
77-
78-
//property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
79-
//property 'forge.logging.console.level', 'debug'
80-
81-
args '--mod', 'oreganized', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/')
82-
83-
environment 'target', 'fmluserdevdata'
84-
61+
ideaModule "${rootProject.name}.${project.name}.main"
62+
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
63+
taskName 'Data'
64+
args "-mixin.config=${mod_id}.mixins.json"
8565
mods {
86-
oreganized {
66+
modDataRun {
8767
source sourceSets.main
8868
}
8969
}
9070
}
9171
}
92-
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
9372
}
9473

95-
// Include resources generated by data generators.
96-
sourceSets.main.resources {
97-
srcDir 'src/generated/resources'
98-
}
74+
sourceSets.main.resources.srcDir 'src/generated/resources'
9975

10076
repositories {
10177
maven {
102-
url='https://repo.spongepowered.org/repository/maven-public/'
78+
// Location of the maven that hosts JEI files (and TiC)
79+
name 'Progwml6 maven'
80+
url 'https://dvs1.progwml6.com/files/maven'
10381
}
10482
maven {
105-
// location of the maven that hosts JEI files
106-
name = "Progwml6 maven"
107-
url = "https://dvs1.progwml6.com/files/maven/"
83+
// Location of a maven mirror for JEI files, as a fallback
84+
name 'ModMaven'
85+
url 'https://modmaven.k-4u.nl'
10886
}
10987
maven {
110-
// location of a maven mirror for JEI files, as a fallback
111-
name = "ModMaven"
112-
url = "https://modmaven.dev"
88+
// Location of the maven for vazkii's mods
89+
name 'blamejared'
90+
url 'https://maven.blamejared.com'
11391
}
114-
11592
maven {
116-
url "https://cursemaven.com"
93+
url 'https://www.cursemaven.com'
11794
content {
11895
includeGroup "curse.maven"
11996
}
12097
}
12198
}
12299

123100
dependencies {
124-
minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
101+
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
102+
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
125103

126104
// compile against the JEI API but do not include it at runtime
127-
//compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
128-
//compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
105+
//compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
106+
//compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
129107
// at runtime, use the full JEI jar for Forge
130-
//runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
108+
//runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
109+
110+
//implementation fg.deobf("curse.maven:detailab-520755:3865073")
131111

132-
implementation fg.deobf("curse.maven:detailab-520755:3865073")
112+
runtimeOnly fg.deobf("curse.maven:catalogue-459701:3873264")
113+
runtimeOnly fg.deobf("curse.maven:configured-457570:3872190")
133114

134115
// For testing and showcasing with pretty shaders:
135116
//runtimeOnly fg.deobf("curse.maven:oculus-581495:3821406")
136117
//runtimeOnly fg.deobf("curse.maven:rubidium-574856:3749094")
137-
138-
139-
//annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
140-
}
141-
/*
142-
mixin {
143-
add sourceSets.main, "oreganized.refmap.json"
144-
config 'oreganized.mixins.json'
145118
}
146-
*/
147-
148119

149120
jar {
150121
manifest {
151122
attributes([
152-
"Specification-Title" : "oreganized",
153-
"Specification-Vendor" : "galena",
154-
"Specification-Version" : "1", // We are version 1 of ourselves
155-
"Implementation-Title" : project.name,
156-
"Implementation-Version" : "${project.oreganized_version}",
157-
"Implementation-Vendor" : "galena",
158-
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
159-
//"MixinConfigs": "oreganized.mixins.json"
123+
'Specification-Title' : mod_name,
124+
'Specification-Vendor' : mod_author,
125+
'Specification-Version' : project.jar.archiveVersion,
126+
'Implementation-Title' : project.name,
127+
'Implementation-Version' : project.jar.archiveVersion,
128+
'Implementation-Vendor' : mod_author,
129+
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
130+
'Timestampe' : System.currentTimeMillis(),
131+
'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
132+
'Build-On-Minecraft' : minecraft_version
160133
])
161134
}
162135
}
@@ -166,12 +139,22 @@ jar.finalizedBy('reobfJar')
166139
publishing {
167140
publications {
168141
mavenJava(MavenPublication) {
142+
groupId project.group
143+
artifactId project.archivesBaseName
144+
version project.version
169145
artifact jar
170146
}
171147
}
172148
repositories {
173149
maven {
174-
url "file://${project.projectDir}/mcmodsrepo"
150+
url "file://" + System.getenv("local_maven")
175151
}
176152
}
177153
}
154+
155+
// Disables Gradle's custom module metadata from being published to maven. The
156+
// metadata includes mapped dependencies which are not reasonably consumable by
157+
// other mod developers.
158+
tasks.withType(GenerateModuleMetadata) {
159+
enabled = false
160+
}

‎gradle.properties

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1+
# Project
2+
version=1.0.3
3+
group=galena
4+
mod_name=Oreganized
5+
mod_author=Xaidee as part of Team Galena
6+
mod_id=oreganized
7+
8+
# Gradle
19
org.gradle.jvmargs=-Xmx4G
210
org.gradle.daemon=false
3-
oreganized_version=1.0.0
4-
mc_version=1.19
5-
forge_version=41.0.64
6-
parchment_version=2022.03.13
7-
jei_version=11.0.0.206
11+
12+
# Minecraft
13+
minecraft_version = 1.19
14+
15+
# Forge
16+
forgegradle_version = 5.1.+
17+
forge_version=41.1.0
18+
//forge_ats_enabled=true
19+
20+
# Mixin
21+
mixingradle_version = 0.7-SNAPSHOT
22+
mixin_version = 0.8.5
23+
24+
# Other Dependencies
25+
jei_version = 11.0.0.206

‎src/main/java/galena/oreganized/Oreganized.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package galena.oreganized;
22

3-
import com.redlimerl.detailab.api.DetailArmorBarAPI;
4-
import com.redlimerl.detailab.api.render.ArmorBarRenderManager;
5-
import com.redlimerl.detailab.api.render.ItemBarRenderManager;
6-
import com.redlimerl.detailab.api.render.TextureOffset;
3+
//import com.redlimerl.detailab.api.DetailArmorBarAPI;
4+
//import com.redlimerl.detailab.api.render.ArmorBarRenderManager;
5+
//import com.redlimerl.detailab.api.render.TextureOffset;
76
import galena.oreganized.client.OreganizedClient;
7+
import galena.oreganized.content.index.*;
88
import galena.oreganized.data.*;
9-
import galena.oreganized.registry.*;
109
import net.minecraft.client.renderer.item.ItemProperties;
1110
import net.minecraft.data.DataGenerator;
1211
import net.minecraft.resources.ResourceLocation;
@@ -18,13 +17,13 @@
1817
import net.minecraft.world.item.alchemy.Potions;
1918
import net.minecraftforge.common.MinecraftForge;
2019
import net.minecraftforge.common.data.ExistingFileHelper;
20+
import net.minecraftforge.data.event.GatherDataEvent;
2121
import net.minecraftforge.eventbus.api.IEventBus;
2222
import net.minecraftforge.fml.ModList;
2323
import net.minecraftforge.fml.common.Mod;
2424
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
2525
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
2626
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
27-
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
2827
import net.minecraftforge.registries.DeferredRegister;
2928
import org.apache.logging.log4j.LogManager;
3029
import org.apache.logging.log4j.Logger;
@@ -88,14 +87,14 @@ private void clientSetup(FMLClientSetupEvent event) {
8887
}
8988
});
9089

91-
if (ModList.get().isLoaded("detailab")) {
90+
/*if (ModList.get().isLoaded("detailab")) {
9291
ResourceLocation texture = new ResourceLocation(MOD_ID, "textures/gui/armor_bar.png");
9392
DetailArmorBarAPI.customArmorBarBuilder().armor((ArmorItem) OItems.ELECTRUM_CHESTPLATE.get(), (ArmorItem) OItems.ELECTRUM_HELMET.get(), (ArmorItem) OItems.ELECTRUM_LEGGINGS.get(), (ArmorItem) OItems.ELECTRUM_BOOTS.get())
9493
.render((ItemStack itemStack) ->
9594
new ArmorBarRenderManager(texture, 18, 18,
9695
new TextureOffset(9, 9), new TextureOffset(0, 9), new TextureOffset(9, 0), new TextureOffset(0, 0))
9796
).register();
98-
}
97+
}*/
9998
}
10099

101100
public void gatherData(GatherDataEvent event) {

‎src/main/java/galena/oreganized/client/OreganizedClient.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import galena.oreganized.Oreganized;
44
import galena.oreganized.client.render.entity.ShrapnelBombRender;
5-
import galena.oreganized.entity.ShrapnelBomb;
6-
import galena.oreganized.registry.OBlocks;
7-
import galena.oreganized.registry.OEntityTypes;
5+
import galena.oreganized.content.index.OBlocks;
6+
import galena.oreganized.content.index.OEntityTypes;
87
import net.minecraft.client.Camera;
98
import net.minecraft.client.renderer.ItemBlockRenderTypes;
109
import net.minecraft.client.renderer.RenderType;

0 commit comments

Comments
 (0)