Merge pull request #2 from Bigjango13/7.1

Fix wolves, remove unneeded dependency.

Author: UselessBullets

build.gradle

@@ -81,10 +81,6 @@ dependencies {
 	modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
 	modImplementation "fabric-loader:fabric-loader:${project.loader_version}"
 
-	// Helper library
-	// If you do not need Halplibe you can comment this line out or delete this line
-	modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
-
 	modImplementation "ModMenu:ModMenu:2.0.5"
 
 	implementation "org.slf4j:slf4j-api:1.8.0-beta4"

gradle.properties

@@ -6,9 +6,6 @@ bta_version=7.1
 # Loader
 loader_version=0.15.6-babric.4-bta
 
-# HalpLibe
-halplibe_version=3.5.3
-
 # Mod
 mod_version=1.1.0-7.1
 mod_group=useless

src/main/java/useless/btabreeding/BtaBreeding.java

@@ -6,10 +6,6 @@
 import net.minecraft.core.world.World;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import turniplabs.halplibe.helper.BlockBuilder;
-import turniplabs.halplibe.util.GameStartEntrypoint;
-import turniplabs.halplibe.util.RecipeEntrypoint;
-
 
 public class BtaBreeding implements ModInitializer {
     public static final String MOD_ID = "btabreeding";

src/main/java/useless/btabreeding/mixin/EntityAnimalMixin.java

@@ -157,7 +157,7 @@ public void onLivingUpdate() {
 			fedTimer--;
 		}
 		List<Entity> list = this.world.getEntitiesWithinAABBExcludingEntity(this, this.bb.expand(0.2F, 0.0, 0.2F));
-		if (list != null && !list.isEmpty()) {
+		if (list != null && !list.isEmpty() && !isMovementCeased()) {
             for (Entity entity : list) {
                 if (entity instanceof IBreeding &&
 					entity.getClass().isInstance(this) &&
@@ -172,7 +172,7 @@ public void onLivingUpdate() {
             }
 		}
 
-		if (tickCount % 40 == 0){
+		if (tickCount % 40 == 0 && !isMovementCeased()){
 			list = this.world.getEntitiesWithinAABBExcludingEntity(this, this.bb.expand(10F, 10F, 10F));
 			if (btabreeding$isBaby() && btabreeding$getPassiveTarget() == null){
 				for (Entity entity : list) {
@@ -185,32 +185,26 @@ public void onLivingUpdate() {
 				}
 			}
 			else if (btabreeding$isFed()){
-				block0:
-				{
-					for (Entity entity : list) {
-						if (entity instanceof IBreeding &&
-							entity.getClass().isInstance(this) &&
-							this.btabreeding$isFed() &&
-							((IBreeding) entity).btabreeding$isFed() &&
-							this.btabreeding$isBreedable() &&
-							((IBreeding) entity).btabreeding$isBreedable()) {
-							this.btabreeding$setPassiveTarget(entity);
-							break block0;
-						}
+				this.btabreeding$setPassiveTarget(null);
+				for (Entity entity : list) {
+					if (entity instanceof IBreeding &&
+						entity.getClass().isInstance(this) &&
+						this.btabreeding$isFed() &&
+						((IBreeding) entity).btabreeding$isFed() &&
+						this.btabreeding$isBreedable() &&
+						((IBreeding) entity).btabreeding$isBreedable()) {
+						this.btabreeding$setPassiveTarget(entity);
+						break;
 					}
-					this.btabreeding$setPassiveTarget(null);
 				}
 
 			} else if (btabreeding$isBreedable()) {
-				block0:
-				{
-					for (Entity entity : list) {
-						if (entity instanceof EntityPlayer && btabreeding$isFoodItem(((EntityPlayer) entity).getHeldItem())) {
-							this.btabreeding$setPassiveTarget(entity);
-							break block0;
-						}
+				this.btabreeding$setPassiveTarget(null);
+				for (Entity entity : list) {
+					if (entity instanceof EntityPlayer && btabreeding$isFoodItem(((EntityPlayer) entity).getHeldItem())) {
+						this.btabreeding$setPassiveTarget(entity);
+						break;
 					}
-					this.btabreeding$setPassiveTarget(null);
 				}
 			}
 

src/main/java/useless/btabreeding/mixin/EntityWolfMixin.java

@@ -47,4 +47,9 @@ public EntityWolfMixin(World world) {
 			}
 		}
 	}
+
+    @Override
+    public boolean btabreeding$isBreedable() {
+        return getHealth() >= getMaxHealth() && super.btabreeding$isBreedable();
+    }
 }