Skip to content

Commit

Permalink
More Integration/My Dev Env appears to be Cursed
Browse files Browse the repository at this point in the history
  • Loading branch information
f-raZ0R committed Oct 1, 2024
1 parent 225c259 commit 40fff0c
Show file tree
Hide file tree
Showing 19 changed files with 425 additions and 73 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ modonomicon_version=1.75.0
trinkets_version=3.7.1
# https://github.com/emilyploszaj/step-height-entity-attribute
step_height_attribute_version=1.2.0
cca_version=5.2.1
cca_version=5.2.2
additional_entity_attributes_version=1.7.5+1.20.0
revelationary_version=1.3.8+1.20.1
fractal_version=1.2.0
matchbooks_version=1.20-SNAPSHOT
# https://github.com/JamiesWhiteShirt/reach-entity-attributes
reach_entity_attributes_version=2.4.0
reach_entity_attributes_version=2.5.0
arrowhead_version=797635e3c7
mixin_extras_version=0.3.5
mixin_extras_version=0.4.1
# https://github.com/Terrails/colorful-hearts
colorful_hearts_version=4.0.4
# https://modrinth.com/mod/sodium
Expand All @@ -46,7 +46,7 @@ ears_version=1.4.5
# https://modrinth.com/mod/enchantment-descriptions/versions
#enchantment_descriptions_version=hPYsgWD1
# https://modrinth.com/mod/idwtialsimmoedm/versions
idwtialsimmoedm_version=0.3.0+1.20
idwtialsimmoedm_version=0.3.1+1.20
# https://modrinth.com/mod/travelersbackpack/
travelers_backpack_version=xa2rNDt3
# https://modrinth.com/mod/botania/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ public EntityData initialize(ServerWorldAccess world, LocalDifficulty difficulty
protected void initGoals() {
this.goalSelector.add(0, new SwimGoal(this));
this.goalSelector.add(1, new HorseBondWithPlayerGoal(this, 1.4));
this.goalSelector.add(2, new PounceAtTargetGoal(this, 0.2F));
this.goalSelector.add(2, new PounceAtTargetGoal(this, 0.5F));
this.goalSelector.add(3, new CancellableProjectileAttackGoal(this, 1.25, 30, 20.0F));
this.goalSelector.add(3, new MeleeChaseGoal(this));
this.goalSelector.add(4, new CancellableProjectileAttackGoal(this, 1.25, 40, 20.0F));
this.goalSelector.add(5, new AnimalMateGoal(this, 1.0D));
this.goalSelector.add(6, new PlayRoughGoal(this));
this.goalSelector.add(7, new TemptGoal(this, 1.25, FOOD, false));
Expand Down Expand Up @@ -757,7 +757,7 @@ protected void setMobEntityTarget(MobEntity mob, LivingEntity target) {
protected class MeleeChaseGoal extends MeleeAttackGoal {

public MeleeChaseGoal(KindlingEntity kindling) {
super(kindling, 0.5F, true);
super(kindling, 0.6F, true);
}

@Override
Expand Down Expand Up @@ -871,12 +871,12 @@ public CancellableProjectileAttackGoal(RangedAttackMob mob, double mobSpeed, int

@Override
public boolean shouldContinue() {
return KindlingEntity.this.hasAngerTime() && super.shouldContinue() && distanceTo(getProjectileTarget()) > 5F;
return KindlingEntity.this.hasAngerTime() && super.shouldContinue() && distanceTo(getProjectileTarget()) > 3F;
}

@Override
public boolean canStart() {
return super.canStart() && !isPlaying() && distanceTo(getProjectileTarget()) > 6F;
return super.canStart() && !isPlaying() && distanceTo(getProjectileTarget()) > 4F;
}

protected LivingEntity getProjectileTarget() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class UnlockToastManager {
put(SpectrumCommon.locate("midgame/spectrum_midgame"), new Pair<>(SpectrumBlocks.PEDESTAL_ONYX.asItem().getDefaultStack(), "second_advancement_tree_unlocked"));
put(SpectrumCommon.locate("lategame/spectrum_lategame"), new Pair<>(SpectrumBlocks.PEDESTAL_MOONSTONE.asItem().getDefaultStack(), "third_advancement_tree_unlocked"));
put(SpectrumCommon.locate("ascend_kindling"), new Pair<>(SpectrumBlocks.PEDESTAL_MOONSTONE.asItem().getDefaultStack(), "ascend_kindling"));
put(SpectrumCommon.locate("vivisect_kindling"), new Pair<>(SpectrumItems.DIVINATION_HEART.getDefaultStack(), "vivisect_kindling"));
put(SpectrumCommon.locate("mod_integration/neepmeat/vivisect_kindling"), new Pair<>(SpectrumItems.DIVINATION_HEART.getDefaultStack(), "vivisect_kindling"));
put(PaintbrushItem.UNLOCK_COLORING_ADVANCEMENT_ID, new Pair<>(SpectrumItems.PAINTBRUSH.getDefaultStack(), "block_coloring_unlocked"));
put(PaintbrushItem.UNLOCK_INK_SLINGING_ADVANCEMENT_ID, new Pair<>(SpectrumItems.PAINTBRUSH.getDefaultStack(), "paint_flinging_unlocked"));
}};
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/spectrum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -5140,6 +5140,8 @@
"spectrum.toast.message.shooting_stars_unlocked.title": "Blessing of the Stars",
"spectrum.toast.message.ascend_kindling.text": "§lLorian will remember that.",
"spectrum.toast.message.ascend_kindling.title": "Uh Oh!",
"spectrum.toast.message.vivisect_kindling.text": "What is wrong with you?",
"spectrum.toast.message.vivisect_kindling.title": "§lYou Monster...",
"spectrum.toast.message.third_advancement_tree_unlocked.text": "You unlocked a new Advancement Tree",
"spectrum.toast.message.third_advancement_tree_unlocked.title": "Chapter 3: Turn to Purity",
"spectrum.toast.midnight_solution_converting_recipe_unlocked.title": "New Midnight Sol. recipe:",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"criteria": {
"animal_cruelty": {
"trigger": "neepmeat:vivisection",
"conditions": {
"entity_type": "spectrum:kindling"
}
}
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"neepmeat"
]
}
]
}
66 changes: 11 additions & 55 deletions src/main/resources/data/spectrum/loot_tables/blocks/amaranth.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,6 @@
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "spectrum:amaranth_grains",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4
}
},
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:binomial_with_bonus_count",
"parameters": {
"extra": 1,
"probability": 0.5714286
}
}
],
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "farmersdelight:tools/knives"
}
},
{
"condition": "minecraft:block_state_property",
"block": "spectrum:amaranth",
"properties": {
"age": "7"
}
}
]
},
{
"type": "minecraft:item",
"name": "spectrum:amaranth_bushel",
Expand Down Expand Up @@ -84,29 +47,22 @@
]
}
]
},
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:item",
"name": "farmersdelight:straw",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "farmersdelight:tools/knives"
}
}
]
}
]
}
],
"functions": [
{
"function": "minecraft:explosion_decay"
}
],
"fabric:load_conditions": [
{
"condition": "fabric:not",
"value": {
"condition": "fabric:all_mods_loaded",
"values": [
"farmersdelight"
]
}
}
]
}
120 changes: 120 additions & 0 deletions src/main/resources/data/spectrum/loot_tables/blocks/amaranth_fd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "spectrum:amaranth_grains",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4
}
},
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:binomial_with_bonus_count",
"parameters": {
"extra": 1,
"probability": 0.5714286
}
}
],
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "farmersdelight:tools/knives"
}
},
{
"condition": "minecraft:block_state_property",
"block": "spectrum:amaranth",
"properties": {
"age": "7"
}
}
]
},
{
"type": "minecraft:item",
"name": "spectrum:amaranth_bushel",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "spectrum:amaranth",
"properties": {
"age": "7"
}
}
],
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:binomial_with_bonus_count",
"parameters": {
"extra": 1,
"probability": 0.5714286
}
}
]
},
{
"type": "minecraft:item",
"name": "spectrum:amaranth_grains",
"count": 1
}
]
}
]
},
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:item",
"name": "farmersdelight:straw",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "farmersdelight:tools/knives"
}
}
]
}
]
}
],
"functions": [
{
"function": "minecraft:explosion_decay"
}
],
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"farmersdelight"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TODO:Actually play with the mod to get a good understanding of what compat to add
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"experience": 2.0,
"result": {
"item": "create:cinder_flour",
"count": 45
"count": 64
},
"particleEffectIdentifier": "enchanted_hit",
"soundEventIdentifier": "block.metal.break",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
"count": 4
},
"center_ingredient": {
"item": "create:empty_blaze_burner"
"item": "create:empty_blaze_burner",
"count": 4
},
"result": {
"item": "create:blaze_burner"
"item": "create:blaze_burner",
"count": 4
},
"fabric:load_conditions": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "neepmeat:entity_manufacture",
"base": {
"id": "spectrum:egg_laying_wooly_pig"
},
"steps": [
{
"id": "neepmeat:implant",
"resource": "neepmeat:chrysalis"
}
],
"implant_installer": {
"id": "neepmeat:chrysalis"
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"neepmeat"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "neepmeat:entity_to_item",
"base": {
"id": "spectrum:egg_laying_wooly_pig"
},
"steps": [
{
"id": "neepmeat:implant",
"resource": "neepmeat:enlightened_brain"
}
],
"result": {
"resource": "neepmeat:brain_rough",
"amount": 3
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"neepmeat"
]
}
]
}
Loading

0 comments on commit 40fff0c

Please sign in to comment.