Skip to content

Commit

Permalink
Update to 1.20.5 (#186)
Browse files Browse the repository at this point in the history
- Update to 24w12a
- Dropped Columns support
- Refactored registration of content
- Capybara variants are now data-driven
  • Loading branch information
Hugman76 authored Apr 5, 2024
1 parent d60f8f9 commit 7c48e16
Show file tree
Hide file tree
Showing 1,141 changed files with 23,027 additions and 22,958 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ Listen to **Brise couleur pastel** on [Bandcamp](https://ludocrypt.bandcamp.com/
### Compatible mods
Promenade is compatible with the following mods:

- Columns: [GitHub](https://github.com/haykam821/Columns) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/columns)
- Farming for Blockheads: [GitHub](https://github.com/ModdingForBlockheads/FarmingForBlockheads) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/farming-for-blockheads-fabric)

## 🌟 Special Thanks
Expand Down
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.2-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
}

apply from: 'https://dawnteammc.github.io/resources/gradle_scripts/fabric-mod/java-17.gradle'
Expand All @@ -8,7 +8,6 @@ repositories {
maven { url 'https://jitpack.io' } // Required for Dawn API
maven { url 'https://maven.terraformersmc.com/' } // Required for Mod Menu and Terraform APIs
maven { url 'https://maven.shedaniel.me/' } // Required for Cloth Config
maven { url 'https://maven.ryanliptak.com/' } // Required for AppleSkin

maven { url 'https://maven.minecraftforge.net/' } // Required for TerraBlender

Expand All @@ -17,11 +16,13 @@ repositories {
}

dependencies {
modApi "com.github.DawnTeamMC:DawnAPI:${dawn_version}"
modApi ("com.github.DawnTeamMC:DawnAPI:${dawn_version}"){
exclude(group: "net.fabricmc.fabric-api")
}

includeMod "com.terraformersmc:biolith:${biolith_version}"
includeMod "com.terraformersmc:biolith-fabric:${biolith_version}"

/* TODO haykam
/*
modImplementation ("curse.maven:columns-385230:${columns_version}"){
exclude(group: "net.fabricmc.fabric-api")
}
Expand Down
1 change: 0 additions & 1 deletion curseforge.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ <h3>Required mods</h3>
<h3>Compatible mods</h3>
<p>Promenade is compatible with the following mods:</p>
<ul>
<li>Columns: <a href="https://github.com/haykam821/Columns">GitHub</a> / <a href="https://www.curseforge.com/minecraft/mc-mods/columns">CurseForge</a></li>
<li>Farming for Blockheads: <a href="https://github.com/ModdingForBlockheads/FarmingForBlockheads">GitHub</a> / <a href="https://www.curseforge.com/minecraft/mc-mods/farming-for-blockheads-fabric">CurseForge</a></li>
</ul>

Expand Down
16 changes: 7 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ loader_name=Fabric
loader_icon=https://fabricmc.net/assets/logo.png

# check these on https://fabricmc.net/versions.html
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.2
loader_version=0.14.21
fabric_version=0.83.1+1.20.1
minecraft_version=24w13a
yarn_mappings=24w13a+build.7
loader_version=0.15.7
fabric_version=0.96.13+1.20.5

# https://github.com/DawnTeamMC/DawnAPI
dawn_version=5.0.0
# https://maven.terraformersmc.com/releases/com/terraformersmc/biolith
biolith_version=1.0.0-alpha.8
# https://www.curseforge.com/minecraft/mc-mods/columns
columns_version=3836307
dawn_version=snapshot-SNAPSHOT
# https://maven.terraformersmc.com/releases/com/terraformersmc/biolith-fabric
biolith_version=2.1.0-alpha.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion modrinth.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ Listen to **Brise couleur pastel** on [Bandcamp](https://ludocrypt.bandcamp.com/
### Compatible mods
Promenade is compatible with the following mods:

- Columns: [GitHub](https://github.com/haykam821/Columns) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/columns)
- Farming for Blockheads: [GitHub](https://github.com/ModdingForBlockheads/FarmingForBlockheads) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/farming-for-blockheads-fabric)

## 🌟 Special Thanks
Expand Down
80 changes: 43 additions & 37 deletions src/main/java/fr/hugman/promenade/Promenade.java
Original file line number Diff line number Diff line change
@@ -1,52 +1,58 @@
package fr.hugman.promenade;

import fr.hugman.dawn.Registrar;
import com.google.common.reflect.Reflection;
import fr.hugman.promenade.block.PromenadeBlocks;
import fr.hugman.promenade.boat.PromenadeBoatTypes;
import fr.hugman.promenade.config.PromenadeConfig;
import fr.hugman.promenade.entity.PromenadeEntityTypes;
import fr.hugman.promenade.entity.ai.brain.sensor.PromenadeSensorTypes;
import fr.hugman.promenade.entity.data.PromenadeTrackedData;
import fr.hugman.promenade.registry.content.*;
import fr.hugman.promenade.item.PromenadeItems;
import fr.hugman.promenade.registry.PromenadeRegistries;
import fr.hugman.promenade.sound.PromenadeSoundEvents;
import fr.hugman.promenade.world.biome.PromenadeBiomes;
import fr.hugman.promenade.world.gen.feature.PromenadeFeatures;
import fr.hugman.promenade.world.gen.feature.PromenadePlacedFeatures;
import fr.hugman.promenade.world.gen.placement_modifier.PromenadePlacementModifierTypes;
import fr.hugman.promenade.world.gen.tree.foliage.PromenadeFoliagePlacerTypes;
import fr.hugman.promenade.world.gen.tree.trunk.PromenadeTrunkPlacerTypes;
import me.shedaniel.autoconfig.AutoConfig;
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
import me.shedaniel.autoconfig.serializer.PartitioningSerializer;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public class Promenade implements ModInitializer {
public static final Registrar REGISTRAR = new Registrar("promenade");
public static final Logger LOGGER = LogManager.getLogger();
public static final PromenadeConfig CONFIG = AutoConfig.register(PromenadeConfig.class, PartitioningSerializer.wrap(GsonConfigSerializer::new)).getConfig();

@Override
public void onInitialize() {
PromenadeTrackedData.init();
PromenadeSensorTypes.register(REGISTRAR);

AnimalContent.register(REGISTRAR);
MonsterContent.register(REGISTRAR);

CommonContent.register(REGISTRAR);
VanillaPilesContent.register(REGISTRAR);
FoodContent.register(REGISTRAR);
IgneousContent.register(REGISTRAR);

SakuraContent.register(REGISTRAR);
MapleContent.register(REGISTRAR);
TropicalContent.register(REGISTRAR);
GlaglaglaContent.register(REGISTRAR);
AmaranthContent.register(REGISTRAR);

if(FabricLoader.getInstance().isModLoaded("columns")) {
//TODO: haykam
//ColumnsContent.init();
//Promenade.LOGGER.info("Initialized Columns compatibility");
Promenade.LOGGER.warn("Columns compatibility has not yet been implemented");
}
}

public static Identifier id(String path) {
return REGISTRAR.id(path);
}
public static final String MOD_ID = "promenade";
public static final Logger LOGGER = LogManager.getLogger();
public static final PromenadeConfig CONFIG = AutoConfig.register(PromenadeConfig.class, PartitioningSerializer.wrap(GsonConfigSerializer::new)).getConfig();

@Override
public void onInitialize() {
PromenadeRegistries.register();

PromenadeBlocks.appendItemGroups();
PromenadeItems.appendItemGroups();

PromenadeBlocks.appendVillagerTrades();

Reflection.initialize(PromenadeFeatures.class);
Reflection.initialize(PromenadePlacementModifierTypes.class);
Reflection.initialize(PromenadeFoliagePlacerTypes.class);
Reflection.initialize(PromenadeTrunkPlacerTypes.class);
Reflection.initialize(PromenadeSensorTypes.class);
Reflection.initialize(PromenadeBoatTypes.class);
Reflection.initialize(PromenadeSoundEvents.class);
Reflection.initialize(PromenadeTrackedData.class);

PromenadeBiomes.appendWorldGen();
PromenadePlacedFeatures.appendWorldGen();
PromenadeEntityTypes.appendWorldGen();
}

public static Identifier id(String path) {
return Identifier.of(MOD_ID, path);
}
}
Loading

0 comments on commit 7c48e16

Please sign in to comment.