Skip to content

Commit

Permalink
fixed it up
Browse files Browse the repository at this point in the history
sorry about the fat commit
  • Loading branch information
lever1209 committed Jan 25, 2024
1 parent 7b74ee8 commit ec36fda
Show file tree
Hide file tree
Showing 31 changed files with 947 additions and 683 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,4 @@ bin/

run/

# custom

darkness/
schema.tic
/.apt_generated/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![build](https://github.com/lever1209/pandora-core/actions/workflows/build.yml/badge.svg?branch=development-1.19.x)](https://github.com/lever1209/pandora-core/actions/workflows/build.yml)

Imagine a world where you are at the bottom of the food chain.
The only thing you know about them is they dont like being seen.
The only thing you know about them is they dont like being seen.
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@ dependencies {
// fapi
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation ("com.terraformersmc:modmenu:${modmenu_version}") {
modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") {
exclude(group: "net.fabricmc.fabric-api")
}

include modApi("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") { // one or the other, most likely spruce
include modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { // one or the other, most likely spruce
exclude(group: "net.fabricmc.fabric-api")
}
include modApi("dev.lambdaurora:spruceui:${project.spruceui_version}")

include modApi("com.github.LlamaLad7:MixinExtras:0.1.0-rc5")
annotationProcessor "com.github.LlamaLad7:MixinExtras:0.1.0-rc5"
// apparently this is bundled in fabric loader 15+? check how to use that version instead
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_versions}")))

// include modApi("com.github.LlamaLad7:MixinExtras:0.1.0-rc5")
// annotationProcessor "com.github.LlamaLad7:MixinExtras:0.1.0-rc5"

// implementation 'me.nullicorn:Nedit:2.2.0' // temporary unless proven useful
include modApi("org.snakeyaml:snakeyaml-engine:${snakeyaml_engine_version}")
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
# https://fabricmc.net/develop
minecraft_version=1.19
yarn_mappings=1.19+build.4
loader_version=0.14.9
loader_version=0.15.6
fabric_version=0.58.0+1.19

# Mod Properties
Expand All @@ -17,4 +17,5 @@ slf4j_simple_version=1.7.9 # will crash if updated
snakeyaml_engine_version=2.4
cloth_config_version=8.2.88
spruceui_version=3.3.3+1.18
architectury_version=5.12.44
architectury_version=5.12.44
mixinextras_versions=0.3.5
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

public class CustomDamageSources extends DamageSource {
protected boolean fire;
public static final DamageSource GRUE = new CustomDamageSources(
"pandora.darkness");
public static final DamageSource GRUE = new CustomDamageSources("pandora.darkness");

protected CustomDamageSources(String name) {
super(name);
Expand Down
50 changes: 30 additions & 20 deletions src/main/java/pkg/deepCurse/pandora/core/Pandora.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,43 @@
import pkg.deepCurse.pandora.core.util.tools.*;

public class Pandora implements ModInitializer, PreLaunchEntrypoint {

private static Logger log = LoggerFactory.getLogger(Pandora.class);

// TODO hip lantern
// TODO hip lantern?

// TODO light enchantment
// TODO light enchantment? glowstone ash and ghast tear paste to become an armor trim instead?

// TODO torches burn out and can only be relit twice, after that they turn to ash
// TODO torches burn out and can only be relit twice, after that they turn to
// ash

// TODO refil lanterns with phantom membrane, and have 3x slower burn rate

// TODO glowstone paste of some kind to augment equipment with light, vanishes on repair and grindstone
// TODO glowstone paste of some kind to augment equipment with light, vanishes
// on repair and grindstone

/* TODO "tutorial" message
* first time player gets "Its pitch black, you are likely to be eaten by a grue."
* then cooldown, and 50% every time you enter darkness, until you get it, then cooldown
* then chance reduces to 15%, until message has appeared 10 times, then disable message
/*
* TODO "tutorial" message first time player gets
* "Its pitch black, you are likely to be eaten by a grue." then cooldown, and
* 50% every time you enter darkness, until you get it, then cooldown then
* chance reduces to 15%, until message has appeared 10 times, then disable
* message
*/

// TODO setup gamerules for select config options

// TODO fade light level

// TODO fix readme, that last line is kinda cringe

// TODO add button on worlds menu to recalculate all blocks lighting, potentially dangerous with non vanilla, so throw up a warning, this "solves" the lighting artifacts when changing lighting values without needing too much cpu power in game, should only be used when editing these values or when converting world to pandora


// TODO setup gamerules for select config options

// TODO fade light level

// TODO fix readme, that last line is kinda cringe

// TODO add button on worlds menu to recalculate all blocks lighting,
// potentially dangerous with non vanilla, so throw up a warning, this "solves"
// the lighting artifacts when changing lighting values without needing too much
// cpu power in game, should only be used when editing these values or when
// converting world to pandora since all lighting values are cached

// TODO spawn a light generating whisp when respawning, it lasts 2 minutes and
// follows the player, or until the player enters the light
@Override
public void onPreLaunch() {
log.info("[Pandora] Running pre launch initializers. . .");
Expand All @@ -63,7 +73,7 @@ public void onInitialize() {
log.info("[Pandora] Loaded and applied config.");

registerHooks();

log.info("[Pandora] Finished initializing mod.");

}
Expand All @@ -79,5 +89,5 @@ public static void registerHooks() {
PandoraTools.overrideLuminance(id, block);
});
}

}
Loading

0 comments on commit ec36fda

Please sign in to comment.