Skip to content

Commit

Permalink
2.0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Faboslav committed Aug 8, 2024
2 parents 9f4a438 + 032148c commit e9d9f0a
Show file tree
Hide file tree
Showing 10 changed files with 305 additions and 102 deletions.
183 changes: 136 additions & 47 deletions .github/assets/curseforge/html/fabric.html

Large diffs are not rendered by default.

179 changes: 133 additions & 46 deletions .github/assets/curseforge/html/forge.html

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.16

- Fixed glares breeding
- Added wildfire to the freeze_hurts_extra_types tag
- Disabled auto check for new mod updates (previously enabled by default)

## 2.0.15

- Fixed pig spawning in the iceologer cabin structure
Expand Down Expand Up @@ -57,30 +63,37 @@
- Updated translations

## 2.0.6

- Fixed crash on forge dedicated servers related to Moobloom variants
- Updated translations

## 2.0.5

- Improved compatibility for certain mods with tweaks in datapack driven Moobloom variant system
- Lowered fabric loader version requirement to 0.14.21

## 2.0.4

- Improved Copper Golems sections in ancient city center pieces

## 2.0.3

- Fixed Moobloom variants not working properly with dedicated servers
- Fixed NeoForge (both client and server should now work)

## 2.0.2

- Fixed crash related to Blaze/Wildfire/Illusioner (again)
- Reworked Moobloom variants to use datapacks instead of internal api
- Nerfed wildfire crown

## 2.0.1

- Fixed crash related to Blaze
- Fixed Mauler being immortal

## 2.0.0

- Fixed compatibility problems leading to client/server crashes related to Illusioner and Blaze interactions
- Fixed Mauler collider box scaling issues
- Boosted Mauler scaling allowing significant growth when fed with enchanted items
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
public final class FriendsAndFoesConfig implements Config
{
@Category("General")
@Description("Check if the new update of mod is available (when enabled, info is in the console)")
public boolean checkForNewUpdates = true;
@Description("Check if the new update of mod is available")
public boolean checkForNewUpdates = false;

@Category("Copper Golem")
@Description("Enable")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
import net.minecraft.world.World;
import net.minecraft.world.event.GameEvent;
import org.jetbrains.annotations.Nullable;

import java.util.function.Predicate;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand Down Expand Up @@ -639,14 +638,22 @@ public PassiveEntity createChild(ServerWorld serverWorld, PassiveEntity entity)
@Override
public boolean canBreedWith(AnimalEntity other) {
if (
this.isTamed() == false
|| (other instanceof GlareEntity) == false
other == this
|| !this.isTamed()
|| !(other instanceof GlareEntity)
) {
return false;
}

GlareEntity glare = (GlareEntity) other;
return glare.isTamed() && super.canBreedWith(other);
if (
!glare.isTamed()
|| glare.isInSittingPose()
) {
return false;
}

return this.isInLove() && glare.isInLove();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ public static Ingredient getTemptItems() {
MemoryModuleType.TEMPTING_PLAYER,
MemoryModuleType.TEMPTATION_COOLDOWN_TICKS,
MemoryModuleType.ITEM_PICKUP_COOLDOWN_TICKS,
MemoryModuleType.IS_PANICKING,
MemoryModuleType.IS_TEMPTED,
MemoryModuleType.VISIBLE_MOBS,
MemoryModuleType.PATH,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"subtitle.entity.friendsandfoes.wildfire.death": "Wildfire dies",
"subtitle.entity.friendsandfoes.wildfire.hurt": "Wildfire hurts",
"subtitle.entity.friendsandfoes.wildfire.shield_break": "Wildfire's shield brokes",
"subtitle.entity.friendsandfoes.wildfire.shockwave": "Wilsfire shockwaves",
"subtitle.entity.friendsandfoes.wildfire.shockwave": "Wildfire shockwaves",
"subtitle.entity.friendsandfoes.wildfire.shoot": "Wildfire shoots",
"subtitle.entity.friendsandfoes.wildfire.step": "Footsteps",
"subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire summons blazes",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@
"trinkets.slot.charm.charm": "Charm",
"text.betterf3.line.glares": "Glares",
"text.betterf3.line.rascals": "Malandros"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"friendsandfoes:wildfire"
]
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.caching=true
# Mod
mod_name=Friends&Foes
mod_id=friendsandfoes
mod_version=2.0.15
mod_version=2.0.16
mod_author=Faboslav
mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.
maven_group=com.faboslav.friendsandfoes
Expand Down

0 comments on commit e9d9f0a

Please sign in to comment.