From c777d9d1980a17273646a3b65c962a9e62c27527 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:44:20 -0700
Subject: [PATCH] Rename RogueCurrencyInfo
---
.../lunarcore/proto/RogueInfoOuterClass.java | 72 +++++++++---------
....java => RogueVirtualItemsOuterClass.java} | 74 +++++++++----------
.../lunarcore/game/rogue/RogueManager.java | 2 +-
3 files changed, 74 insertions(+), 74 deletions(-)
rename src/generated/main/emu/lunarcore/proto/{RogueCurrencyInfoOuterClass.java => RogueVirtualItemsOuterClass.java} (84%)
diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
index 2f47029..bae6245 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
@@ -56,9 +56,9 @@ public final class RogueInfoOuterClass {
private int status;
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
*/
- private final RogueCurrencyInfoOuterClass.RogueCurrencyInfo rogueCurrencyInfo = RogueCurrencyInfoOuterClass.RogueCurrencyInfo.newInstance();
+ private final RogueVirtualItemsOuterClass.RogueVirtualItems rogueVirtualItems = RogueVirtualItemsOuterClass.RogueVirtualItems.newInstance();
/**
* optional .RogueCurrentInfo rogue_progress = 83;
@@ -385,39 +385,39 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
- * @return whether the rogueCurrencyInfo field is set
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
+ * @return whether the rogueVirtualItems field is set
*/
- public boolean hasRogueCurrencyInfo() {
+ public boolean hasRogueVirtualItems() {
return (bitField0_ & 0x00000080) != 0;
}
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
* @return this
*/
- public RogueInfo clearRogueCurrencyInfo() {
+ public RogueInfo clearRogueVirtualItems() {
bitField0_ &= ~0x00000080;
- rogueCurrencyInfo.clear();
+ rogueVirtualItems.clear();
return this;
}
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRogueCurrencyInfo()} if you want to modify it.
+ * Use {@link #getMutableRogueVirtualItems()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RogueCurrencyInfoOuterClass.RogueCurrencyInfo getRogueCurrencyInfo() {
- return rogueCurrencyInfo;
+ public RogueVirtualItemsOuterClass.RogueVirtualItems getRogueVirtualItems() {
+ return rogueVirtualItems;
}
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -425,20 +425,20 @@ public final class RogueInfoOuterClass {
*
* @return internal storage object for modifications
*/
- public RogueCurrencyInfoOuterClass.RogueCurrencyInfo getMutableRogueCurrencyInfo() {
+ public RogueVirtualItemsOuterClass.RogueVirtualItems getMutableRogueVirtualItems() {
bitField0_ |= 0x00000080;
- return rogueCurrencyInfo;
+ return rogueVirtualItems;
}
/**
- * optional .RogueCurrencyInfo rogue_currency_info = 5;
- * @param value the rogueCurrencyInfo to set
+ * optional .RogueVirtualItems rogue_virtual_items = 5;
+ * @param value the rogueVirtualItems to set
* @return this
*/
- public RogueInfo setRogueCurrencyInfo(
- final RogueCurrencyInfoOuterClass.RogueCurrencyInfo value) {
+ public RogueInfo setRogueVirtualItems(
+ final RogueVirtualItemsOuterClass.RogueVirtualItems value) {
bitField0_ |= 0x00000080;
- rogueCurrencyInfo.copyFrom(value);
+ rogueVirtualItems.copyFrom(value);
return this;
}
@@ -819,7 +819,7 @@ public final class RogueInfoOuterClass {
talentPoints = other.talentPoints;
hDBPIDMBJOH = other.hDBPIDMBJOH;
status = other.status;
- rogueCurrencyInfo.copyFrom(other.rogueCurrencyInfo);
+ rogueVirtualItems.copyFrom(other.rogueVirtualItems);
rogueProgress.copyFrom(other.rogueProgress);
rogueData.copyFrom(other.rogueData);
roomMap.copyFrom(other.roomMap);
@@ -857,8 +857,8 @@ public final class RogueInfoOuterClass {
if (other.hasStatus()) {
setStatusValue(other.status);
}
- if (other.hasRogueCurrencyInfo()) {
- getMutableRogueCurrencyInfo().mergeFrom(other.rogueCurrencyInfo);
+ if (other.hasRogueVirtualItems()) {
+ getMutableRogueVirtualItems().mergeFrom(other.rogueVirtualItems);
}
if (other.hasRogueProgress()) {
getMutableRogueProgress().mergeFrom(other.rogueProgress);
@@ -895,7 +895,7 @@ public final class RogueInfoOuterClass {
talentPoints = 0;
hDBPIDMBJOH = 0;
status = 0;
- rogueCurrencyInfo.clear();
+ rogueVirtualItems.clear();
rogueProgress.clear();
rogueData.clear();
roomMap.clear();
@@ -912,7 +912,7 @@ public final class RogueInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- rogueCurrencyInfo.clearQuick();
+ rogueVirtualItems.clearQuick();
rogueProgress.clearQuick();
rogueData.clearQuick();
roomMap.clearQuick();
@@ -939,7 +939,7 @@ public final class RogueInfoOuterClass {
&& (!hasTalentPoints() || talentPoints == other.talentPoints)
&& (!hasHDBPIDMBJOH() || hDBPIDMBJOH == other.hDBPIDMBJOH)
&& (!hasStatus() || status == other.status)
- && (!hasRogueCurrencyInfo() || rogueCurrencyInfo.equals(other.rogueCurrencyInfo))
+ && (!hasRogueVirtualItems() || rogueVirtualItems.equals(other.rogueVirtualItems))
&& (!hasRogueProgress() || rogueProgress.equals(other.rogueProgress))
&& (!hasRogueData() || rogueData.equals(other.rogueData))
&& (!hasRoomMap() || roomMap.equals(other.roomMap))
@@ -980,7 +980,7 @@ public final class RogueInfoOuterClass {
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeRawByte((byte) 42);
- output.writeMessageNoTag(rogueCurrencyInfo);
+ output.writeMessageNoTag(rogueVirtualItems);
}
if ((bitField0_ & 0x00000100) != 0) {
output.writeRawLittleEndian16((short) 1434);
@@ -1037,7 +1037,7 @@ public final class RogueInfoOuterClass {
size += 1 + ProtoSink.computeEnumSizeNoTag(status);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCurrencyInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItems);
}
if ((bitField0_ & 0x00000100) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(rogueProgress);
@@ -1134,8 +1134,8 @@ public final class RogueInfoOuterClass {
}
}
case 42: {
- // rogueCurrencyInfo
- input.readMessage(rogueCurrencyInfo);
+ // rogueVirtualItems
+ input.readMessage(rogueVirtualItems);
bitField0_ |= 0x00000080;
tag = input.readTag();
if (tag != 666) {
@@ -1240,7 +1240,7 @@ public final class RogueInfoOuterClass {
output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter());
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeMessage(FieldNames.rogueCurrencyInfo, rogueCurrencyInfo);
+ output.writeMessage(FieldNames.rogueVirtualItems, rogueVirtualItems);
}
if ((bitField0_ & 0x00000100) != 0) {
output.writeMessage(FieldNames.rogueProgress, rogueProgress);
@@ -1356,11 +1356,11 @@ public final class RogueInfoOuterClass {
}
break;
}
- case 2062299993:
- case -468018569: {
- if (input.isAtField(FieldNames.rogueCurrencyInfo)) {
+ case 370696815:
+ case -768163865: {
+ if (input.isAtField(FieldNames.rogueVirtualItems)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueCurrencyInfo);
+ input.readMessage(rogueVirtualItems);
bitField0_ |= 0x00000080;
}
} else {
@@ -1506,7 +1506,7 @@ public final class RogueInfoOuterClass {
static final FieldName status = FieldName.forField("status");
- static final FieldName rogueCurrencyInfo = FieldName.forField("rogueCurrencyInfo", "rogue_currency_info");
+ static final FieldName rogueVirtualItems = FieldName.forField("rogueVirtualItems", "rogue_virtual_items");
static final FieldName rogueProgress = FieldName.forField("rogueProgress", "rogue_progress");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrencyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemsOuterClass.java
similarity index 84%
rename from src/generated/main/emu/lunarcore/proto/RogueCurrencyInfoOuterClass.java
rename to src/generated/main/emu/lunarcore/proto/RogueVirtualItemsOuterClass.java
index 885ff7b..7fb2cf5 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCurrencyInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemsOuterClass.java
@@ -11,11 +11,11 @@ import us.hebi.quickbuf.ProtoMessage;
import us.hebi.quickbuf.ProtoSink;
import us.hebi.quickbuf.ProtoSource;
-public final class RogueCurrencyInfoOuterClass {
+public final class RogueVirtualItemsOuterClass {
/**
- * Protobuf type {@code RogueCurrencyInfo}
+ * Protobuf type {@code RogueVirtualItems}
*/
- public static final class RogueCurrencyInfo extends ProtoMessage implements Cloneable {
+ public static final class RogueVirtualItems extends ProtoMessage implements Cloneable {
private static final long serialVersionUID = 0L;
/**
@@ -38,14 +38,14 @@ public final class RogueCurrencyInfoOuterClass {
*/
private int rogueTalentPoints;
- private RogueCurrencyInfo() {
+ private RogueVirtualItems() {
}
/**
- * @return a new empty instance of {@code RogueCurrencyInfo}
+ * @return a new empty instance of {@code RogueVirtualItems}
*/
- public static RogueCurrencyInfo newInstance() {
- return new RogueCurrencyInfo();
+ public static RogueVirtualItems newInstance() {
+ return new RogueVirtualItems();
}
/**
@@ -60,7 +60,7 @@ public final class RogueCurrencyInfoOuterClass {
* optional uint32 ALLDDMKKICK = 1;
* @return this
*/
- public RogueCurrencyInfo clearALLDDMKKICK() {
+ public RogueVirtualItems clearALLDDMKKICK() {
bitField0_ &= ~0x00000001;
aLLDDMKKICK = 0;
return this;
@@ -79,7 +79,7 @@ public final class RogueCurrencyInfoOuterClass {
* @param value the aLLDDMKKICK to set
* @return this
*/
- public RogueCurrencyInfo setALLDDMKKICK(final int value) {
+ public RogueVirtualItems setALLDDMKKICK(final int value) {
bitField0_ |= 0x00000001;
aLLDDMKKICK = value;
return this;
@@ -97,7 +97,7 @@ public final class RogueCurrencyInfoOuterClass {
* optional uint32 DOMMGENHGKE = 4;
* @return this
*/
- public RogueCurrencyInfo clearDOMMGENHGKE() {
+ public RogueVirtualItems clearDOMMGENHGKE() {
bitField0_ &= ~0x00000002;
dOMMGENHGKE = 0;
return this;
@@ -116,7 +116,7 @@ public final class RogueCurrencyInfoOuterClass {
* @param value the dOMMGENHGKE to set
* @return this
*/
- public RogueCurrencyInfo setDOMMGENHGKE(final int value) {
+ public RogueVirtualItems setDOMMGENHGKE(final int value) {
bitField0_ |= 0x00000002;
dOMMGENHGKE = value;
return this;
@@ -134,7 +134,7 @@ public final class RogueCurrencyInfoOuterClass {
* optional uint32 KMAGFHIIALA = 10;
* @return this
*/
- public RogueCurrencyInfo clearKMAGFHIIALA() {
+ public RogueVirtualItems clearKMAGFHIIALA() {
bitField0_ &= ~0x00000004;
kMAGFHIIALA = 0;
return this;
@@ -153,7 +153,7 @@ public final class RogueCurrencyInfoOuterClass {
* @param value the kMAGFHIIALA to set
* @return this
*/
- public RogueCurrencyInfo setKMAGFHIIALA(final int value) {
+ public RogueVirtualItems setKMAGFHIIALA(final int value) {
bitField0_ |= 0x00000004;
kMAGFHIIALA = value;
return this;
@@ -171,7 +171,7 @@ public final class RogueCurrencyInfoOuterClass {
* optional uint32 rogue_talent_points = 14;
* @return this
*/
- public RogueCurrencyInfo clearRogueTalentPoints() {
+ public RogueVirtualItems clearRogueTalentPoints() {
bitField0_ &= ~0x00000008;
rogueTalentPoints = 0;
return this;
@@ -190,14 +190,14 @@ public final class RogueCurrencyInfoOuterClass {
* @param value the rogueTalentPoints to set
* @return this
*/
- public RogueCurrencyInfo setRogueTalentPoints(final int value) {
+ public RogueVirtualItems setRogueTalentPoints(final int value) {
bitField0_ |= 0x00000008;
rogueTalentPoints = value;
return this;
}
@Override
- public RogueCurrencyInfo copyFrom(final RogueCurrencyInfo other) {
+ public RogueVirtualItems copyFrom(final RogueVirtualItems other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
@@ -210,7 +210,7 @@ public final class RogueCurrencyInfoOuterClass {
}
@Override
- public RogueCurrencyInfo mergeFrom(final RogueCurrencyInfo other) {
+ public RogueVirtualItems mergeFrom(final RogueVirtualItems other) {
if (other.isEmpty()) {
return this;
}
@@ -231,7 +231,7 @@ public final class RogueCurrencyInfoOuterClass {
}
@Override
- public RogueCurrencyInfo clear() {
+ public RogueVirtualItems clear() {
if (isEmpty()) {
return this;
}
@@ -245,7 +245,7 @@ public final class RogueCurrencyInfoOuterClass {
}
@Override
- public RogueCurrencyInfo clearQuick() {
+ public RogueVirtualItems clearQuick() {
if (isEmpty()) {
return this;
}
@@ -259,10 +259,10 @@ public final class RogueCurrencyInfoOuterClass {
if (o == this) {
return true;
}
- if (!(o instanceof RogueCurrencyInfo)) {
+ if (!(o instanceof RogueVirtualItems)) {
return false;
}
- RogueCurrencyInfo other = (RogueCurrencyInfo) o;
+ RogueVirtualItems other = (RogueVirtualItems) o;
return bitField0_ == other.bitField0_
&& (!hasALLDDMKKICK() || aLLDDMKKICK == other.aLLDDMKKICK)
&& (!hasDOMMGENHGKE() || dOMMGENHGKE == other.dOMMGENHGKE)
@@ -310,7 +310,7 @@ public final class RogueCurrencyInfoOuterClass {
@Override
@SuppressWarnings("fallthrough")
- public RogueCurrencyInfo mergeFrom(final ProtoSource input) throws IOException {
+ public RogueVirtualItems mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
@@ -384,7 +384,7 @@ public final class RogueCurrencyInfoOuterClass {
}
@Override
- public RogueCurrencyInfo mergeFrom(final JsonSource input) throws IOException {
+ public RogueVirtualItems mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
@@ -446,8 +446,8 @@ public final class RogueCurrencyInfoOuterClass {
}
@Override
- public RogueCurrencyInfo clone() {
- return new RogueCurrencyInfo().copyFrom(this);
+ public RogueVirtualItems clone() {
+ return new RogueVirtualItems().copyFrom(this);
}
@Override
@@ -455,32 +455,32 @@ public final class RogueCurrencyInfoOuterClass {
return ((bitField0_) == 0);
}
- public static RogueCurrencyInfo parseFrom(final byte[] data) throws
+ public static RogueVirtualItems parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new RogueCurrencyInfo(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new RogueVirtualItems(), data).checkInitialized();
}
- public static RogueCurrencyInfo parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new RogueCurrencyInfo(), input).checkInitialized();
+ public static RogueVirtualItems parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new RogueVirtualItems(), input).checkInitialized();
}
- public static RogueCurrencyInfo parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new RogueCurrencyInfo(), input).checkInitialized();
+ public static RogueVirtualItems parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new RogueVirtualItems(), input).checkInitialized();
}
/**
- * @return factory for creating RogueCurrencyInfo messages
+ * @return factory for creating RogueVirtualItems messages
*/
- public static MessageFactory getFactory() {
- return RogueCurrencyInfoFactory.INSTANCE;
+ public static MessageFactory getFactory() {
+ return RogueVirtualItemsFactory.INSTANCE;
}
- private enum RogueCurrencyInfoFactory implements MessageFactory {
+ private enum RogueVirtualItemsFactory implements MessageFactory {
INSTANCE;
@Override
- public RogueCurrencyInfo create() {
- return RogueCurrencyInfo.newInstance();
+ public RogueVirtualItems create() {
+ return RogueVirtualItems.newInstance();
}
}
diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
index eede78b..9c809c7 100644
--- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
+++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
@@ -126,7 +126,7 @@ public class RogueManager extends BasePlayerManager {
.setBeginTime(beginTime)
.setEndTime(endTime);
- proto.getMutableRogueCurrencyInfo()
+ proto.getMutableRogueVirtualItems()
.setRogueTalentPoints(getPlayer().getTalentPoints());
// Rogue data