Skip to content

Commit

Permalink
Last Commit for now, i am completely burnt out
Browse files Browse the repository at this point in the history
  • Loading branch information
f-raZ0R committed Oct 3, 2024
1 parent 5e98ab3 commit aea4133
Show file tree
Hide file tree
Showing 18 changed files with 161 additions and 44 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ dependencies {
modCompileOnly("maven.modrinth:sodium:${project.sodium_version}") { transitive = false }
modCompileOnly("com.unascribed:ears-api:${project.ears_version}")
modCompileOnly("maven.modrinth:create-fabric:${project.create_version}") { transitive = false }
modCompileOnly("maven.modrinth:neepmeat:${project.neepmeat_version}") { transitive = false }
// modCompileOnly("maven.modrinth:enchantment-descriptions:${project.enchantment_descriptions_version}")
modCompileOnly("maven.modrinth:travelersbackpack:${project.travelers_backpack_version}")
modCompileOnly("maven.modrinth:botania:${project.botania_version}")
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ botania_version=1.20.1-444-fabric
auth_me_version=7.0.2+1.20
# https://modrinth.com/mod/create-fabric
create_version=0.5.1-f-build.1417+mc1.20.1
# https://modrinth.com/mod/neepmeat
neepmeat_version=0.6.2-beta+1.20.1

# What recipe viewer to use ('emi', 'rei', or 'disabled')
recipe_viewer=emi
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import de.dafuqs.spectrum.compat.create.*;
import de.dafuqs.spectrum.compat.gobber.*;
import de.dafuqs.spectrum.compat.modonomicon.*;
import de.dafuqs.spectrum.compat.neepmeat.NEEPMeatCompat;
import de.dafuqs.spectrum.compat.travelersbackpack.*;
import net.fabricmc.api.*;
import net.fabricmc.loader.api.*;
Expand Down Expand Up @@ -39,6 +40,8 @@ protected static void registerIntegrationPack(String modId, Supplier<ModIntegrat
public static final String MODONOMICON_ID = "modonomicon";
public static final String CREATE_ID = "create";

public static final String NEEPMEAT_ID = "neepmeat";

@SuppressWarnings("Convert2MethodRef")
public static void register() {
registerIntegrationPack(AE2_ID, () -> new AE2Compat());
Expand All @@ -48,6 +51,7 @@ public static void register() {
registerIntegrationPack(BOTANIA_ID, () -> new BotaniaCompat());
registerIntegrationPack(MODONOMICON_ID, () -> new ModonomiconCompat());
registerIntegrationPack(CREATE_ID, () -> new CreateCompat());
registerIntegrationPack(NEEPMEAT_ID, () -> new NEEPMeatCompat());

for (ModIntegrationPack container : INTEGRATION_PACKS.values()) {
container.register();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package de.dafuqs.spectrum.compat.neepmeat;

import com.neep.neepmeat.enlightenment.PlayerEnlightenmentManager;
import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound;

public class NEEPMeatCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
public void register() {

}

@Environment(EnvType.CLIENT)
@Override
public void registerClient() {

}

public static void sedateEnlightenment(LivingEntity user)
{
if(user.isPlayer())
{
PlayerEnlightenmentManager enlightenmentManager = new PlayerEnlightenmentManager((PlayerEntity) user);
NbtCompound tag = new NbtCompound();
enlightenmentManager.writeToNbt(tag);
double acuteEnlightenment = tag.getDouble("acute");
if(acuteEnlightenment>0)
{
tag.putDouble("acute", Math.max(0, acuteEnlightenment*0.75 - 1));
enlightenmentManager.readFromNbt(tag);
}
}
}

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package de.dafuqs.spectrum.items.food;

import de.dafuqs.spectrum.compat.neepmeat.NEEPMeatCompat;
import de.dafuqs.spectrum.items.*;
import de.dafuqs.spectrum.registries.*;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.entity.*;
import net.minecraft.entity.effect.*;
import net.minecraft.item.*;
Expand Down Expand Up @@ -30,7 +32,10 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {
}

}

if(FabricLoader.getInstance().isModLoaded("neepmeat"))
{
NEEPMeatCompat.sedateEnlightenment(user);
}
}

return super.finishUsing(stack, world, user);
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/spectrum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4062,6 +4062,7 @@
"item.minecraft.potion.effect.pigment_potion": "§2P§3i§cg§6m§be§en§dt§f Potion",
"item.minecraft.splash_potion.effect.pigment_potion": "Splash §2P§3i§cg§6m§be§en§dt§f Potion",
"item.minecraft.tipped_arrow.effect.pigment_potion": "§2P§3i§cg§6m§be§en§dt§f Dipped Arrow",
"item.neepmeat.goggles.tooltip_with_ink": "§7Uses %s§7 to see §l§fFurther Beyond.",
"item.spectrum.aloe_leaf": "Aloe Leaf",
"item.spectrum.amaranth_grains": "Amaranth Grains",
"item.spectrum.amethyst_cluster_banner_pattern": "Banner Pattern",
Expand Down Expand Up @@ -4152,7 +4153,7 @@
"item.spectrum.bottle_of_failing": "Bottle of Failing",
"item.spectrum.bottle_of_failing.tooltip": "§e⚠ Hungry",
"item.spectrum.bottle_of_forfeiture": "Bottle of Forfeiture",
"item.spectrum.bottle_of_forfeiture.tooltip": "§4⚠ I hope I know what I am rdoing",
"item.spectrum.bottle_of_forfeiture.tooltip": "§4⚠ I hope I know what I am doing",
"item.spectrum.bottle_of_ruin": "Bottle of Ruin",
"item.spectrum.bottle_of_ruin.tooltip": "§4⚠ I will probably regret this, won't I?",
"item.spectrum.bottomless_bundle": "Bottomless Bundle",
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "spectrum:midnight_solution_converting",
"ingredient": {
"item": "minecraft:iron_bars"
},
"result": {
"item": "neepmeat:rusted_bars",
"count": 1
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"neepmeat"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "spectrum:midnight_solution_converting",
"ingredient": {
"item": "neepmeat:polished_metal"
},
"result": {
"item": "neepmeat:rusty_metal",
"count": 1
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"neepmeat"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"type": "spectrum:pedestal_shapeless",
"time": 80,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"experience": 0.2,
"ingredients": [
{
"item": "spectrum:meatloaf"
},
{
"item": "sandwichable:ancient_grain_bread"
},
{
"item": "spectrum:clotted_cream"
}
],
"result": {
"item": "spectrum:meatloaf_sandwich",
"count": 6
},
"required_advancement": "spectrum:hidden/collect_cookbooks/melochites_cookbook_vol_1",
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"sandwichable"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
{
"id": "minecraft:slowness",
"base_duration": 9600,
"base_duration": 6000,
"potency": [
{
"min_alc": 10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"fluid": {
"fluid": "spectrum:liquid_crystal"
"tag": "c:honey"
},
"min_fermentation_time_hours": 24,
"fermentation_data": {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "spectrum:drop_self",
"block": {
"blocks": [
"immersive_weathering:charred_log",
"immersive_weathering:charred_planks",
"immersive_weathering:charred_stairs",
"immersive_weathering:charred_slab",
"immersive_weathering:charred_fence",
"immersive_weathering:charred_gate"
]
},
"state_properties_to_copy": [
"smoldering"
],
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"immersive_weathering"
]
}
]
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"immersive_weathering:sandy_chiseled_stone_bricks"
]
},
"nbt_to_copy": [
"state_properties_to_copy": [
"sand_age",
"sandiness"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
"spectrum:resonant_lily",
"spectrum:amaranth_bushel",
"spectrum:blood_orchid",
"spectrum:doombloom"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"spectrum:resonant_lily",
"spectrum:amaranth_bushel",
"spectrum:blood_orchid"
"spectrum:blood_orchid",
"spectrum:doombloom"
]
}

0 comments on commit aea4133

Please sign in to comment.