Merge pull request #1 from WildBamaBoy/1.12.2-6.0.0

Update
WildBamaBoy · Jun 28, 2019 · 377cae6 · 377cae6
2 parents de8bbe4 + 1efab5f
commit 377cae6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/mca/client/gui/GuiInteract.java b/src/main/java/mca/client/gui/GuiInteract.java
@@ -207,7 +207,7 @@ private boolean canDrawParentsIcon() {
     }
 
     private boolean canDrawGiftIcon() {
-        return villager.getPlayerHistoryFor(player.getUniqueID()).getHasGift();
+        return villager.getPlayerHistoryFor(player.getUniqueID()).isGiftPresent();
     }
 
     protected void actionPerformed(GuiButton button) {

diff --git a/src/main/java/mca/client/gui/GuiVillagerEditor.java b/src/main/java/mca/client/gui/GuiVillagerEditor.java
@@ -84,7 +84,7 @@ protected void keyTyped(char c, int i) {
         } else {
             nameTextField.textboxKeyTyped(c, i);
             String text = nameTextField.getText().trim();
-            NetMCA.INSTANCE.sendToServer(new NetMCA.SetName(villager.getUniqueID(), text));
+            NetMCA.INSTANCE.sendToServer(new NetMCA.SetName(text, villager.getUniqueID()));
             drawEditorGui();
         }
     }

diff --git a/src/main/java/mca/core/MCAServer.java b/src/main/java/mca/core/MCAServer.java
@@ -254,7 +254,7 @@ public void procreate(EntityPlayer sender) {
         }
 
         // Ensure we don't already have a baby
-        if (senderData.getHasBaby()) {
+        if (senderData.isBabyPresent()) {
             failMessage(sender, "You already have a baby.");
             return;
         }
@@ -274,8 +274,8 @@ public void procreate(EntityPlayer sender) {
                 spouse.addItemStackToInventory(new ItemStack(sender.world.rand.nextBoolean() ? ItemsMCA.BABY_BOY : ItemsMCA.BABY_GIRL));
 
                 PlayerSaveData spouseData = PlayerSaveData.get(spouse);
-                spouseData.setHasBaby(true);
-                senderData.setHasBaby(true);
+                spouseData.setBabyPresent(true);
+                senderData.setBabyPresent(true);
             }
         } else {
             failMessage(sender, "Your spouse is not present on the server.");

diff --git a/src/main/java/mca/entity/EntityVillagerMCA.java b/src/main/java/mca/entity/EntityVillagerMCA.java
@@ -609,7 +609,7 @@ public void handleButtonClick(EntityPlayerMP player, String guiKey, String butto
                 }
                 break;
             case "gui.button.procreate":
-                if (PlayerSaveData.get(player).getHasBaby()) say(Optional.of(player), "interaction.procreate.fail.hasbaby");
+                if (PlayerSaveData.get(player).isBabyPresent()) say(Optional.of(player), "interaction.procreate.fail.hasbaby");
                 else if (history.getHearts() < 100) say(Optional.of(player), "interaction.procreate.fail.lowhearts");
                 else {
                     EntityAITasks.EntityAITaskEntry task = tasks.taskEntries.stream().filter((ai) -> ai.action instanceof EntityAIProcreate).findFirst().orElse(null);

diff --git a/src/main/java/mca/entity/ai/EntityAIProcreate.java b/src/main/java/mca/entity/ai/EntityAIProcreate.java
@@ -34,7 +34,7 @@ public void updateTask() {
             if (spousePlayer != null) {
                 villager.world.playSound(null, villager.posX, villager.posY, villager.posZ, SoundEvents.ENTITY_CHICKEN_EGG, SoundCategory.NEUTRAL, 1.0F, 1.0F);
                 spousePlayer.inventory.addItemStackToInventory(new ItemStack(villager.getRNG().nextBoolean() ? ItemsMCA.BABY_BOY : ItemsMCA.BABY_GIRL));
-                PlayerSaveData.get(spousePlayer).setHasBaby(true);
+                PlayerSaveData.get(spousePlayer).setBabyPresent(true);
 
                 if (villager.getRNG().nextFloat() < MCA.getConfig().chanceToHaveTwins / 100)
                     spousePlayer.inventory.addItemStackToInventory(new ItemStack(villager.getRNG().nextBoolean() ? ItemsMCA.BABY_BOY : ItemsMCA.BABY_GIRL));

diff --git a/src/main/java/mca/entity/data/PlayerHistory.java b/src/main/java/mca/entity/data/PlayerHistory.java
@@ -11,7 +11,7 @@
 public class PlayerHistory {
     @Getter private int hearts;
     @Getter private int interactionFatigue;
-    @Getter private boolean hasGift;
+    @Getter private boolean giftPresent;
     @Getter private int greetTimer;
     @Getter private EnumDialogueType dialogueType;
 
@@ -21,7 +21,7 @@ public class PlayerHistory {
     private PlayerHistory() {
         hearts = 0;
         interactionFatigue = 0;
-        hasGift = false;
+        giftPresent = false;
         greetTimer = 0;
         playerUUID = Constants.ZERO_UUID;
         dialogueType = EnumDialogueType.ADULT;
@@ -47,7 +47,7 @@ public static PlayerHistory fromNBT(EntityVillagerMCA villager, UUID uuid, NBTTa
 
         history.hearts = nbt.getInteger("hearts");
         history.interactionFatigue = nbt.getInteger("interactionFatigue");
-        history.hasGift = nbt.getBoolean("hasGift");
+        history.giftPresent = nbt.getBoolean("giftPresent");
         history.greetTimer = nbt.getInteger("greetTimer");
         history.dialogueType = EnumDialogueType.byValue(nbt.getString("dialogueType"));
 
@@ -59,7 +59,7 @@ public NBTTagCompound toNBT() {
 
         nbt.setInteger("hearts", hearts);
         nbt.setInteger("interactionFatigue", interactionFatigue);
-        nbt.setBoolean("hasGift", hasGift);
+        nbt.setBoolean("giftPresent", giftPresent);
         nbt.setInteger("greetTimer", greetTimer);
         nbt.setString("dialogueType", dialogueType.getId());
 

diff --git a/src/main/java/mca/entity/data/PlayerSaveData.java b/src/main/java/mca/entity/data/PlayerSaveData.java
@@ -24,7 +24,7 @@ public class PlayerSaveData extends WorldSavedData {
     private UUID spouseUUID = Constants.ZERO_UUID;
     private EnumMarriageState marriageState = EnumMarriageState.NOT_MARRIED;
     private String spouseName = "";
-    private boolean hasBaby = false;
+    private boolean babyPresent = false;
 
     public PlayerSaveData(String id) {
         super(id);
@@ -51,7 +51,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
         nbt.setUniqueId("spouseUUID", spouseUUID);
         nbt.setInteger("marriageState", marriageState.getId());
         nbt.setString("spouseName", spouseName);
-        nbt.setBoolean("hasBaby", hasBaby);
+        nbt.setBoolean("babyPresent", babyPresent);
         return nbt;
     }
 
@@ -60,7 +60,7 @@ public void readFromNBT(NBTTagCompound nbt) {
         spouseUUID = nbt.getUniqueId("spouseUUID");
         marriageState = EnumMarriageState.byId(nbt.getInteger("marriageState"));
         spouseName = nbt.getString("spouseName");
-        hasBaby = nbt.getBoolean("hasBaby");
+        babyPresent = nbt.getBoolean("babyPresent");
     }
 
     public boolean isMarriedOrEngaged() {
@@ -81,14 +81,14 @@ public void endMarriage() {
         markDirty();
     }
 
-    public void setHasBaby(boolean value) {
-        this.hasBaby = value;
+    public void setBabyPresent(boolean value) {
+        this.babyPresent = value;
         markDirty();
     }
 
     public void reset() {
         endMarriage();
-        setHasBaby(false);
+        setBabyPresent(false);
         markDirty();
     }
 

diff --git a/src/main/java/mca/items/ItemBaby.java b/src/main/java/mca/items/ItemBaby.java
@@ -83,7 +83,7 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
                 PlayerSaveData playerData = PlayerSaveData.get(player);
                 child.set(EntityVillagerMCA.PARENTS, ParentData.create(player.getUniqueID(), playerData.getSpouseUUID(), player.getName(), playerData.getSpouseName()).toNBT());
                 player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY);
-                playerData.setHasBaby(false);
+                playerData.setBabyPresent(false);
 
                 // set proper dialogue type
                 child.getPlayerHistoryFor(player.getUniqueID()).setDialogueType(EnumDialogueType.CHILDP);