aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/kr/syeyoung')
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/b.java1
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java2
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java4
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java1
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureInstaCloseChest.java1
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java3
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java121
9 files changed, 125 insertions, 12 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/b.java b/src/main/java/kr/syeyoung/dungeonsguide/b.java
index d1351cb6..2e706b39 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/b.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/b.java
@@ -236,7 +236,6 @@ public class b {
((d[1] & 0xFF) << 16) |
((d[2] & 0xFF) << 8) |
((d[3] & 0xFF));
- System.out.println("waiting for "+f+" bytes");
JsonElement l = new JsonParser().parse(new InputStreamReader(k));
b.disconnect();
return l;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java
index e3a51d1f..56cfe179 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java
@@ -87,9 +87,7 @@ public class GuiParameterValueEdit extends GuiScreen {
currentValueEdit.getChildComponents().clear();
ValueEditCreator valueEditCreator = ValueEditRegistry.getValueEditMap(editingObj == null ?"null":editingObj.getClass().getName());
- System.out.println(valueEditCreator);
MPanel valueEdit = (MPanel) valueEditCreator.createValueEdit(parameter= new Parameter("", editingObj, editingObj));
- System.out.println(valueEdit);
if (valueEdit == null) {
MLabel valueEdit2 = new MLabel() {
@Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
index 025ae7fa..665d8a7f 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
@@ -345,7 +345,7 @@ public class MapProcessor {
BlockPos pos = entityPlayer.getPosition();
int dx = mapPos.getX() - pos.getX();
int dz = mapPos.getZ() - pos.getZ();
- if (dx * dx + dz * dz < 81) {
+ if (dx * dx + dz * dz < 100) {
if (potentialPlayer != null) continue label;
potentialPlayer = player;
}
@@ -359,7 +359,7 @@ public class MapProcessor {
int y2 = stringVec4bEntry2.getValue().func_176113_c() /2 + 64;
int dx = x2 - x;
int dy = y2 - y;
- if (dx * dx + dy * dy < 81) {
+ if (dx * dx + dy * dy < 100) {
continue label;
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
index 27ca7227..6c072340 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
@@ -85,6 +85,8 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider {
return new BossfightProcessorThorn();
} else if (floor.equals("F5")) {
return new BossfightProcessorLivid();
+ } else if (floor.equals("F6")) {
+ return new BossfightProcessorSadan();
}
return null;
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java
index 6261df61..88d6998d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java
@@ -37,7 +37,6 @@ public class FeatureBoxRealLivid extends SimpleFeature implements WorldRenderLis
EntityOtherPlayerMP playerMP = ((BossfightProcessorLivid) skyblockStatus.getContext().getBossfightProcessor()).getRealLivid();
Color c = this.<Color>getParameter("color").getValue();
- System.out.println(playerMP.getEntityBoundingBox());
RenderUtils.highlightBox(playerMP, AxisAlignedBB.fromBounds(-0.4,-1.5,-0.4,0.4,0,0.4), c, partialTicks, true);
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureInstaCloseChest.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureInstaCloseChest.java
index c9e58de1..175da78a 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureInstaCloseChest.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureInstaCloseChest.java
@@ -41,7 +41,6 @@ public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenList
if (!(event.gui instanceof GuiChest)) return;
ContainerChest ch = (ContainerChest) ((GuiChest)event.gui).inventorySlots;
- System.out.println(ch.getLowerChestInventory().getName());
if (!("Large Chest".equals(ch.getLowerChestInventory().getName())
|| "Chest".equals(ch.getLowerChestInventory().getName()))) return;
check = true;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java
index a1d048f5..60a8411b 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java
@@ -45,7 +45,6 @@ public class BossfightProcessorBonzo extends GeneralBossfightProcessor {
String name = TextUtils.stripColor(bonzoStand.getName());
String healthPart = name.split(" ")[2];
health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
- System.out.println(healthPart.substring(0, healthPart.length() - 1) + " / "+ health);
}
healths.add(new HealthData("Bonzo", (int) health,250000 , this.getCurrentPhase().startsWith("fight-")));
return healths;
@@ -57,7 +56,6 @@ public class BossfightProcessorBonzo extends GeneralBossfightProcessor {
// §e﴾ §c§lBonzo§r §a250k§c❤ §e﴿
public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) {
if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lBonzo§r ") && updateEvent.entityLiving instanceof EntityArmorStand) {
- System.out.println(updateEvent.entityLiving.getName());
bonzoStand = (EntityArmorStand) updateEvent.entityLiving;
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
index 766e2422..bdee9bd4 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
@@ -37,11 +37,9 @@ public class BossfightProcessorLivid extends GeneralBossfightProcessor {
knownLivids.add(updateEvent.entityLiving.getName());
realLividName = updateEvent.entityLiving.getName();
realLivid = (EntityOtherPlayerMP) updateEvent.entityLiving;
- System.out.println("Think real livid is "+realLividName);
prefix = lividColorPrefix.get(realLividName.split(" ")[0]);
}
} else if (updateEvent.entityLiving.getName().startsWith("§a﴾ "+prefix) && updateEvent.entityLiving instanceof EntityArmorStand) {
- System.out.println(updateEvent.entityLiving.getName());
lividStand = (EntityArmorStand) updateEvent.entityLiving;
}
}
@@ -56,7 +54,6 @@ public class BossfightProcessorLivid extends GeneralBossfightProcessor {
String name = TextUtils.stripColor(lividStand.getName());
String healthPart = name.split(" ")[2];
health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
- System.out.println(healthPart.substring(0, healthPart.length() - 1) + " / " + health);
} catch (Exception e) {e.printStackTrace();}
}
healths.add(new HealthData(realLividName, (int) health,7000000 , true));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java
new file mode 100644
index 00000000..f38d6c02
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java
@@ -0,0 +1,121 @@
+package kr.syeyoung.dungeonsguide.roomprocessor.bossfight;
+
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraftforge.event.entity.living.LivingEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BossfightProcessorSadan extends GeneralBossfightProcessor {
+ public BossfightProcessorSadan() {
+ addPhase(PhaseData.builder()
+ .phase("start")
+ .signatureMsg("So you made it all the way §r§fhere...and§r§f you wish to defy me? Sadan?!§r")
+ .nextPhase("fight-1").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("fight-1")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: I am the bridge between this realm and the world below! You shall not pass!§r")
+ .nextPhase("first-defeat").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("first-defeat")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: ENOUGH!§r")
+ .nextPhase("fight-2").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("fight-2")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: My giants! Unleashed!§r")
+ .nextPhase("second-defeat").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("second-defeat")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: You did it. I understand now, you have earned my respect.§r")
+ .nextPhase("fight-3").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("fight-3")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: I'm sorry but I need to concentrate. I wish it didn't have to come to this.§r")
+ .nextPhase("final-defeat").build()
+ );
+ addPhase(PhaseData.builder()
+ .phase("final-defeat")
+ .signatureMsg("§r§c[BOSS] Sadan§r§f: NOOOOOOOOO!!! THIS IS IMPOSSIBLE!!§r").build()
+ );
+ }
+
+ @Override
+ public List<HealthData> getHealths() {
+ List<HealthData> healths = new ArrayList<HealthData>();
+ {
+ long health = 0;
+ if (sadanStand != null) {
+ String name = TextUtils.stripColor(sadanStand.getName());
+ String healthPart = name.split(" ")[2];
+ health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
+ }
+ healths.add(new HealthData("Sadan", (int) health, 40000000, this.getCurrentPhase().equals("fight-3")));
+ }
+ if (getCurrentPhase().equals("fight-2")) {
+ {
+ long health = 0;
+ if (diamondGiant != null) {
+ String name = TextUtils.stripColor(diamondGiant.getName());
+ String healthPart = name.split(" ")[3];
+ health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
+ }
+ healths.add(new HealthData("The Diamond Giant", (int) health, 25000000, this.getCurrentPhase().startsWith("fight-")));
+ }
+ {
+ long health = 0;
+ if (bigfootGiant != null) {
+ String name = TextUtils.stripColor(bigfootGiant.getName());
+ String healthPart = name.split(" ")[1];
+ health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
+ }
+ healths.add(new HealthData("Bigfoot", (int) health, 25000000, this.getCurrentPhase().startsWith("fight-")));
+ }
+ {
+ long health = 0;
+ if (laserGiant != null) {
+ String name = TextUtils.stripColor(laserGiant.getName());
+ String healthPart = name.split(" ")[1];
+ health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
+ }
+ healths.add(new HealthData("L.A.S.R.", (int) health, 25000000, this.getCurrentPhase().startsWith("fight-")));
+ }
+ {
+ long health = 0;
+ if (boulderGiant != null) {
+ String name = TextUtils.stripColor(boulderGiant.getName());
+ String healthPart = name.split(" ")[3];
+ health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
+ }
+ healths.add(new HealthData("Jolly Pink Giant", (int) health, 25000000, this.getCurrentPhase().startsWith("fight-")));
+ }
+ }
+ return healths;
+ }
+
+ private EntityArmorStand sadanStand;
+ private EntityArmorStand diamondGiant;
+ private EntityArmorStand laserGiant;
+ private EntityArmorStand bigfootGiant;
+ private EntityArmorStand boulderGiant;
+ @Override
+ public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) {
+ if (updateEvent.entityLiving instanceof EntityArmorStand) {
+ if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lSadan§r "))
+ sadanStand = (EntityArmorStand) updateEvent.entityLiving;
+ else if (updateEvent.entityLiving.getName().startsWith("§c§d§lJolly Pink Giant "))
+ boulderGiant = (EntityArmorStand) updateEvent.entityLiving;
+ else if (updateEvent.entityLiving.getName().startsWith("§c§4§lL.A.S.R. "))
+ laserGiant = (EntityArmorStand) updateEvent.entityLiving;
+ else if (updateEvent.entityLiving.getName().startsWith("§c§3§lThe Diamond Giant "))
+ diamondGiant = (EntityArmorStand) updateEvent.entityLiving;
+ else if (updateEvent.entityLiving.getName().startsWith("§c§c§lBigfoot "))
+ bigfootGiant = (EntityArmorStand) updateEvent.entityLiving;
+ }
+ }
+} \ No newline at end of file