Skip to content

Commit

Permalink
Updated to 1.5.4 and removed unnecessary thing
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveeTheEpic committed Nov 28, 2024
1 parent 53ff0fa commit 17f4807
Show file tree
Hide file tree
Showing 23 changed files with 81 additions and 286 deletions.
119 changes: 55 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,28 @@ configurations {

repositories {
mavenLocal()
// mavens for Forge-exclusives
maven { url = "https://api.modrinth.com/maven" } // Jade
maven { url = "https://maven.theillusivec4.top/" } // Curios
maven { // Create Forge and Registrate Forge
url = "https://maven.tterrag.com/"
flatDir {
dir 'libs'
}
mavenCentral()
maven {
name = 'GTCEu Maven'
url = 'https://maven.gtceu.com'
content {
includeGroup("com.tterrag.registrate")
includeGroup("com.simibubi.create")
includeGroup 'com.gregtechceu.gtceu'
}
}
maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
maven { // TOP
url "https://maven.k-4u.nl"
maven {
name 'FirstDarkDev'
url "https://maven.firstdarkdev.xyz/snapshots/"
}
maven {
name 'Quilt'
url 'https://maven.quiltmc.org/repository/release/'
}
maven {
name = 'ParchmentMC'
url = 'https://maven.parchmentmc.org'
}
maven {
// saps.dev Maven (KubeJS and Rhino)
Expand All @@ -100,84 +108,67 @@ repositories {
includeGroup "dev.latvian.mods"
}
}
mavenLocal()
mavenCentral()
maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
maven {
url "https://cursemaven.com"
maven { // Registrate
url = "https://maven.tterrag.com/"
content {
includeGroup "curse.maven"
// need to be specific here due to version overlaps
includeGroup("com.jozufozu.flywheel")
includeGroup("com.tterrag.registrate")
includeGroup("com.simibubi.create")
}
} // Curse Forge File
}
maven {
name = "Jared's maven"
// Patchouli, JEI
name = "BlameJared"
url = "https://maven.blamejared.com/"
} // JEI
maven { url 'https://jitpack.io' } // MixinExtras
}
maven {
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven"
url = "https://modmaven.dev"
} // JEI mirror, AE2
maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
maven { url = "https://maven.quiltmc.org/repository/release/" } // Quilt Mappings
maven { url = "https://maven.firstdarkdev.xyz/snapshots" } // LDLib
url = "https://maven.theillusivec4.top/"
}
maven {
name = "redlance"
url = "https://repo.constructlegacy.ru/public"
// Curse Forge File
url "https://cursemaven.com/"
content {
includeGroup "curse.maven"
}
}
maven {
name = "mixin"
url = "https://repo.spongepowered.org/repository/maven-public/"
// EMI
name = "TerraformersMC"
url = "https://maven.terraformersmc.com/"
}
}

dependencies {
minecraft libs.minecraft
forge forge.minecraftForge

// The following line declares the mojmap mappings, you may use other mappings as well
minecraft "com.mojang:minecraft:$project.minecraft_version"
forge "net.minecraftforge:forge:$project.minecraft_version-$project.forge_version"
// layered mappings - Mojmap names, parchment and QM docs and parameters
mappings loom.layered {
it.mappings("org.quiltmc:quilt-mappings:${libs.versions.minecraft.get()}+build.${libs.versions.quiltMappings.get()}:intermediary-v2")
it.parchment("org.parchmentmc.data:parchment-${libs.versions.minecraft.get()}:${libs.versions.parchment.get()}@zip")
it.mappings("org.quiltmc:quilt-mappings:$project.minecraft_version+build.$project.quilt_mappings:intermediary-v2")
it.parchment("org.parchmentmc.data:parchment-$project.minecraft_version:$project.parchment_mappings@zip")
it.officialMojangMappings { nameSyntheticMembers = false }
}

modCompileOnly("mezz.jei:jei-$project.minecraft_version-forge-api:$project.jei_version") { transitive = false }
modCompileOnly("mezz.jei:jei-$project.minecraft_version-common-api:$project.jei_version") { transitive = false }

modImplementation("com.gregtechceu.gtceu:gtceu-$project.minecraft_version:$project.gtceu_version") { transitive = false }
modImplementation("com.lowdragmc.ldlib:ldlib-forge-$project.minecraft_version:$project.ldlib_version") { transitive = false }
modImplementation("com.tterrag.registrate:Registrate:$project.registrate_version")
modImplementation("dev.latvian.mods:kubejs-forge:$project.kubejs_version")

// LDLib
modImplementation(forge.gtceu.forge) { transitive = false }
modImplementation(forge.ldlib.forge) { transitive = false }

// Registrate
modImplementation("com.tterrag.registrate:Registrate:${forge.versions.registrate.get()}")

// REI
modCompileOnly forge.rei.plugin
modCompileOnly forge.rei.api
modImplementation forge.rei.forge
modRuntimeOnly("dev.toma.configuration:configuration-forge-$project.minecraft_version:$project.configuration_version")
modRuntimeOnly("mezz.jei:jei-$project.minecraft_version-forge:$project.jei_version") { transitive = false }

// TOP
modCompileOnly(forge.theoneprobe) { transitive = false }

// KJS
modImplementation forge.kubejs.forge

// Configuration
modImplementation(forge.configuration)
modRuntimeOnly ("dev.emi:emi-forge:$project.emi_version+$project.minecraft_version")

// Mixin Extras
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${forge.versions.mixinExtras.get()}"))
api("io.github.llamalad7:mixinextras-forge:${forge.versions.mixinExtras.get()}")
// apply a newer mixin AP to fix an issue with building the Lithium mixins
implementation(annotationProcessor("org.spongepowered:mixin:${libs.versions.mixin.get()}:processor"))
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:$project.mixinextras_version"))
implementation(include("io.github.llamalad7:mixinextras-forge:$project.mixinextras_version"))

// lombok
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'

// testing mods
modCompileOnly forge.radium
}

processResources {
Expand Down
17 changes: 16 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,20 @@ maven_group=stevee

loom.platform=forge

gtceu_version=1.5.4
ldlib_version=1.0.33
registrate_version=MC1.20-1.3.11
kubejs_version=2001.6.5-build.14
configuration_version=2.2.0
jei_version=15.20.0.105
emi_version = 1.1.13
mixinextras_version=0.2.0


# Base properties
# minecraft version
minecraft_version=1.20.1
# forge version, latest version can be found on https://files.minecraftforge.net/
forge_version=47.3.10
parchment_mappings=2023.09.03
# quilt mappings, latest version can be found on https://lambdaurora.dev/tools/import_quilt.html
quilt_mappings=23
5 changes: 1 addition & 4 deletions src/generated/resources/assets/gtb/lang/en_ud.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"block.gtb.bacteria_bath": "ɥʇɐᗺ ɐıɹǝʇɔɐᗺ",
"block.gtb.collector": "ɹoʇɔǝןןoƆ",
"item.gtb.bacteria_petri_dish": "ɥsıᗡ ıɹʇǝԀ ɐıɹǝʇɔɐᗺ",
"item.gtb.sterile_petri_dish": "ɥsıᗡ ıɹʇǝԀ ǝןıɹɐʇS",
"material.gtb.lud": "pnꞀ",
"material.gtb.susium": "ɯnısnS"
"item.gtb.sterile_petri_dish": "ɥsıᗡ ıɹʇǝԀ ǝןıɹǝʇS"
}
5 changes: 1 addition & 4 deletions src/generated/resources/assets/gtb/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"block.gtb.bacteria_bath": "Bacteria Bath",
"block.gtb.collector": "Collector",
"item.gtb.bacteria_petri_dish": "Bacteria Petri Dish",
"item.gtb.sterile_petri_dish": "Starile Petri Dish",
"material.gtb.lud": "Lud",
"material.gtb.susium": "Susium"
"item.gtb.sterile_petri_dish": "Sterile Petri Dish"
}
9 changes: 0 additions & 9 deletions src/main/java/stevee/gtb/BacteriaGTAddon.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ public String addonModId() {
return GTBacteria.MOD_ID;
}

@Override
public void registerTagPrefixes() {
}

@Override
public void registerElements() {
IGTAddon.super.registerElements();
Expand All @@ -41,11 +37,6 @@ public void registerCovers() {
IGTAddon.super.registerCovers();
}

@Override
public boolean requiresHighTier() {
return false;
}

@Override
public void registerVeinGenerators() {
IGTAddon.super.registerVeinGenerators();
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/stevee/gtb/GTBacteria.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public static void init() {
ConfigHolder.init(); // Forcefully init GT config because fabric doesn't allow dependents to load after dependencies

//.init();
GTBCompassSections.init();
GTBBlocks.init();
GTBItems.init();
GTBCreativeModeTabs.init();
Expand All @@ -64,24 +63,11 @@ public void registerMaterialRegistry(MaterialRegistryEvent event) {
MATERIAL_REGISTRY = GTCEuAPI.materialManager.createRegistry(GTBacteria.MOD_ID);
}

@SubscribeEvent
public void registerMaterials(MaterialEvent event) {
GTBMaterials.init();
}

@SubscribeEvent
public void registerElements(MaterialEvent event) {
GTBElements.init();
}

@SubscribeEvent
public void modifyMaterials(PostMaterialEvent event) {

}

@SubscribeEvent
public void registerCompassSections(GTCEuAPI.RegisterEvent<ResourceLocation, CompassNode> event) {
GTBCompassSections.init();
}
}

13 changes: 0 additions & 13 deletions src/main/java/stevee/gtb/common/data/GTBCompassSections.java

This file was deleted.

35 changes: 0 additions & 35 deletions src/main/java/stevee/gtb/common/data/GTBElements.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/stevee/gtb/common/data/GTBItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class GTBItems {
.register();

public static final ItemEntry<Item> STERILE_PETRI_DISH = REGISTRATE.item("sterile_petri_dish", Item::new)
.lang("Starile Petri Dish")
.lang("Sterile Petri Dish")
.defaultModel()
.register();

Expand Down
23 changes: 1 addition & 22 deletions src/main/java/stevee/gtb/common/data/GTBMachines.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class GTBMachines {


public static final MultiblockMachineDefinition BACTERIA_BATH = REGISTRATE.multiblock("bacteria_bath", WorkableElectricMultiblockMachine::new)
.langValue("Bacteria Bath")
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(() -> CASING_STAINLESS_CLEAN.get())
.recipeType(GTBRecipeTypes.BACTERIA_RECIPES)
Expand Down Expand Up @@ -53,28 +54,6 @@ public class GTBMachines {
.compassNodeSelf()
.register();

public static final MultiblockMachineDefinition COLLECTOR = REGISTRATE.multiblock("collector", WorkableElectricMultiblockMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(() -> CASING_STEEL_SOLID.get())
.recipeType(GTBRecipeTypes.COLLECTOR)
.pattern(definition -> FactoryBlockPattern.start()
.aisle("HHHH", "HHHH", "HHHH")
.aisle("HHHH", "H H", "HHHH")
.aisle("HHHH", "HCHH", "HHHH")
.where('H', blocks(CASING_STEEL_SOLID.get())
.or(autoAbilities(true, false, false))
.or(abilities(PartAbility.EXPORT_ITEMS))
.or(abilities(PartAbility.IMPORT_ITEMS))
.or(abilities(PartAbility.INPUT_ENERGY))
.or(abilities(PartAbility.INPUT_LASER)))
.where('C', controller(blocks(definition.getBlock())))
.build())
.workableCasingRenderer(GTCEu.id("block/casings/solid/machine_casing_solid_steel"),
GTCEu.id("block/multiblock/implosion_compressor"))
.register();



public static void init() {
}
}
25 changes: 0 additions & 25 deletions src/main/java/stevee/gtb/common/data/GTBMaterials.java

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/java/stevee/gtb/common/data/GTBRecipeTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ public class GTBRecipeTypes {
.setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, ProgressTexture.FillDirection.LEFT_TO_RIGHT)
.setSound(GTSoundEntries.CHEMICAL);


public static final GTRecipeType COLLECTOR = register("collector", MULTIBLOCK)
.setMaxIOSize(0, 1, 0, 0)
.setEUIO(IO.IN)
.setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, ProgressTexture.FillDirection.LEFT_TO_RIGHT)
.setSound(GTSoundEntries.SUS_RECORD);

public static void init() {
}

Expand Down
Loading

0 comments on commit 17f4807

Please sign in to comment.