Fixed conflicts with rabbit and wolf merge

TerraFirmaCraft · Aug 2, 2019 · 025498a · 025498a
1 parent 1b55702
commit 025498a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/net/dries007/tfc/objects/entity/animal/EntityRabbitTFC.java b/src/main/java/net/dries007/tfc/objects/entity/animal/EntityRabbitTFC.java
@@ -39,7 +39,7 @@
 import net.minecraftforge.oredict.OreDictionary;
 
 import net.dries007.tfc.Constants;
-import net.dries007.tfc.util.LootTableListTFC;
+import net.dries007.tfc.objects.LootTablesTFC;
 import net.dries007.tfc.util.OreDictionaryHelper;
 import net.dries007.tfc.util.calendar.CalendarTFC;
 
@@ -295,7 +295,7 @@ protected SoundEvent getAmbientSound()
     @Nullable
     protected ResourceLocation getLootTable()
     {
-        return LootTableListTFC.ANIMALS_RABBIT;
+        return LootTablesTFC.ANIMALS_RABBIT;
     }
 
     @Nullable

diff --git a/src/main/java/net/dries007/tfc/objects/entity/animal/EntityWolfTFC.java b/src/main/java/net/dries007/tfc/objects/entity/animal/EntityWolfTFC.java
@@ -1,3 +1,8 @@
+/*
+ * Work under Copyright. Licensed under the EUPL.
+ * See the project README.md and LICENSE.txt for more information.
+ */
+
 package net.dries007.tfc.objects.entity.animal;
 
 import java.util.UUID;
@@ -37,9 +42,9 @@
 
 import jdk.nashorn.internal.ir.Block;
 import net.dries007.tfc.Constants;
+import net.dries007.tfc.objects.LootTablesTFC;
 import net.dries007.tfc.objects.entity.ai.*;
 import net.dries007.tfc.objects.items.food.ItemFoodTFC;
-import net.dries007.tfc.util.LootTableListTFC;
 import net.dries007.tfc.util.calendar.CalendarTFC;
 
 @ParametersAreNonnullByDefault
@@ -437,7 +442,7 @@ else if (this.rand.nextInt(3) != 0)
     @Nullable
     protected ResourceLocation getLootTable()
     {
-        return LootTableListTFC.ANIMALS_WOLF;
+        return LootTablesTFC.ANIMALS_WOLF;
     }
 
     public int getVerticalFaceSpeed()