diff --git a/.gitignore b/.gitignore index 5d29506b6..5f194f49e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,6 @@ tmp/ src/test node_modules .github/pages-dist +/core/build/ +/platform-api/build/ diff --git a/CNPC+ Texture Pack.zip b/CNPC+ Texture Pack.zip deleted file mode 100644 index 55828d10b..000000000 Binary files a/CNPC+ Texture Pack.zip and /dev/null differ diff --git a/build.gradleOLD b/build.gradleOLD deleted file mode 100644 index ae3246422..000000000 --- a/build.gradleOLD +++ /dev/null @@ -1,214 +0,0 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - maven { - name = "jitpack" - url = "https://jitpack.io" - } - maven { - name = "gt" - url = "https://gregtech.mechaenetia.com/" - } - } - dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.11' - } -} - -task submodulesUpdate(type:Exec) { - description 'Updates (and inits) git submodules' - commandLine 'git', 'submodule', 'update', '--init', '--recursive' - group 'Build Setup' -} - -configurations { - embed - compile.extendsFrom(embed) - shade - compile.extendsFrom(shade) -} - -apply plugin: 'forge' - -version = "1.9-beta6" -group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "CustomNPC-Plus" - -minecraft { - version = "1.7.10-10.13.4.1614-1.7.10" - runDir = "eclipse" - - sourceSets { - api { - java { - srcDir 'src/api/java' - } - } - } -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html -} - -processResources - { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } - } - -jar { - from sourceSets.api.output - - manifest { - attributes( - 'FMLAT': "customnpcs_at.cfg", - ) - } -} - -//########################################################################################################## -//######################################## Mixin Part ################################################ -//########################################################################################################## -//Add -//--tweakClass org.spongepowered.asm.launch.MixinTweaker --mixin customnpcs.mixins.json -//to your client and server program arguments if working in a dev environment. -def embedMixin = !project.hasProperty("nomixin"); -def yourMixinConfig = 'customnpcs.mixins.json' -def refMapForYourConfig = 'customnpcs.refmap.json' -def relativePathToMixinAP = 'tools/mixin-0.8-SNAPSHOT.jar' - -if(!embedMixin){ - version += "-nomixin" -} - -repositories { - maven { - name = "sponge" - url = "https://repo.spongepowered.org/maven/" - } -} - -dependencies { - if(embedMixin){ - embed('org.spongepowered:mixin:0.7.11-SNAPSHOT') { - // Mixin includes a lot of dependencies that are too up-to-date - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - exclude module: 'log4j-core' - } - } else { - implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') { - // Mixin includes a lot of dependencies that are too up-to-date - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - exclude module: 'log4j-core' - } - } -} - -def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + refMapForYourConfig - -def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" - -jar { - configurations.shade.each { dep -> - from(project.zipTree(dep)){ - exclude 'META-INF', 'META-INF/**' - } - } - - from refMap - manifest { - attributes.put("TweakClass", "org.spongepowered.asm.launch.MixinTweaker") - attributes.put("FMLCorePluginContainsFMLMod", true) - attributes.put("ForceLoadAsMod", true) - attributes.put("MixinConfigs", yourMixinConfig) - } - - // embed libraries in jar - from configurations.embed.collect { - exclude '**/LICENSE.txt' - it.isDirectory() ? it : zipTree(it) - } -} - -reobf { - addExtraSrgFile mixinSrg -} - -afterEvaluate { - def fixedRelPathToAP = relativePathToMixinAP - if(fixedRelPathToAP.startsWith('./') || fixedRelPathToAP.startsWith('.\\')){ - fixedRelPathToAP = fixedRelPathToAP.substring(2) - } else if(fixedRelPathToAP.startsWith('/') || fixedRelPathToAP.startsWith('\\')){ - fixedRelPathToAP = fixedRelPathToAP.substring(1) - } - - tasks.compileJava { - println "Path: " + projectDir.absolutePath - options.compilerArgs += [ - // There's a bug in the AnnotationProcessor for 0.7.11 that will generate the annotations pointing to the parent class instead of subclass - // resulting in the mixin not being applied. This is fixed in 0.8, however 0.8 needs guava > 21.0, and minecraft ships with 17.0. - // So as a hacky workaround... ship with 0.7.11, but use the AP from 0.8 for compiling - "-processorpath", projectDir.absolutePath + '/' + fixedRelPathToAP, - "-processor", "org.spongepowered.tools.obfuscation.MixinObfuscationProcessorInjection,org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets", - "-Xlint:-sunapi", "-XDenableSunApiLintControl", "-XDignore.symbol.file", - "-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinSrg}", "-AoutRefMapFile=${refMap}" - ] - } -} - -task deobfJar(type: Jar) { - classifier = 'dev' - from sourceSets.main.output -} - -sourceSets { - main { - ext.refMap = refMapForYourConfig - } -} - -// Enable Temporarily if Assets not loading -sourceSets {main { output.resourcesDir = output.classesDir }} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 000000000..1dd0cb75a --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'java-library' +} + +group = 'noppes.npcs' +version = '1.0' + +// Target Java 8 for compatibility with all MC versions (1.7.10 through 1.20.1) +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +dependencies { + api project(':platform-api') +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} diff --git a/src/main/java/noppes/npcs/constants/AiMutex.java b/core/src/main/java/noppes/npcs/constants/AiMutex.java similarity index 100% rename from src/main/java/noppes/npcs/constants/AiMutex.java rename to core/src/main/java/noppes/npcs/constants/AiMutex.java diff --git a/src/main/java/noppes/npcs/constants/EnumAnimation.java b/core/src/main/java/noppes/npcs/constants/EnumAnimation.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAnimation.java rename to core/src/main/java/noppes/npcs/constants/EnumAnimation.java diff --git a/src/main/java/noppes/npcs/constants/EnumAnimationPart.java b/core/src/main/java/noppes/npcs/constants/EnumAnimationPart.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAnimationPart.java rename to core/src/main/java/noppes/npcs/constants/EnumAnimationPart.java diff --git a/src/main/java/noppes/npcs/constants/EnumAuctionPage.java b/core/src/main/java/noppes/npcs/constants/EnumAuctionPage.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAuctionPage.java rename to core/src/main/java/noppes/npcs/constants/EnumAuctionPage.java diff --git a/src/main/java/noppes/npcs/constants/EnumAvailabilityDialog.java b/core/src/main/java/noppes/npcs/constants/EnumAvailabilityDialog.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAvailabilityDialog.java rename to core/src/main/java/noppes/npcs/constants/EnumAvailabilityDialog.java diff --git a/src/main/java/noppes/npcs/constants/EnumAvailabilityFaction.java b/core/src/main/java/noppes/npcs/constants/EnumAvailabilityFaction.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAvailabilityFaction.java rename to core/src/main/java/noppes/npcs/constants/EnumAvailabilityFaction.java diff --git a/src/main/java/noppes/npcs/constants/EnumAvailabilityFactionType.java b/core/src/main/java/noppes/npcs/constants/EnumAvailabilityFactionType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAvailabilityFactionType.java rename to core/src/main/java/noppes/npcs/constants/EnumAvailabilityFactionType.java diff --git a/src/main/java/noppes/npcs/constants/EnumAvailabilityQuest.java b/core/src/main/java/noppes/npcs/constants/EnumAvailabilityQuest.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumAvailabilityQuest.java rename to core/src/main/java/noppes/npcs/constants/EnumAvailabilityQuest.java diff --git a/src/main/java/noppes/npcs/constants/EnumBannerVariant.java b/core/src/main/java/noppes/npcs/constants/EnumBannerVariant.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumBannerVariant.java rename to core/src/main/java/noppes/npcs/constants/EnumBannerVariant.java diff --git a/src/main/java/noppes/npcs/constants/EnumBardInstrument.java b/core/src/main/java/noppes/npcs/constants/EnumBardInstrument.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumBardInstrument.java rename to core/src/main/java/noppes/npcs/constants/EnumBardInstrument.java diff --git a/src/main/java/noppes/npcs/constants/EnumCategoryType.java b/core/src/main/java/noppes/npcs/constants/EnumCategoryType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumCategoryType.java rename to core/src/main/java/noppes/npcs/constants/EnumCategoryType.java diff --git a/src/main/java/noppes/npcs/constants/EnumCombatPolicy.java b/core/src/main/java/noppes/npcs/constants/EnumCombatPolicy.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumCombatPolicy.java rename to core/src/main/java/noppes/npcs/constants/EnumCombatPolicy.java diff --git a/src/main/java/noppes/npcs/constants/EnumCompanionJobs.java b/core/src/main/java/noppes/npcs/constants/EnumCompanionJobs.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumCompanionJobs.java rename to core/src/main/java/noppes/npcs/constants/EnumCompanionJobs.java diff --git a/src/main/java/noppes/npcs/constants/EnumCompanionStage.java b/core/src/main/java/noppes/npcs/constants/EnumCompanionStage.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumCompanionStage.java rename to core/src/main/java/noppes/npcs/constants/EnumCompanionStage.java diff --git a/src/main/java/noppes/npcs/constants/EnumDayTime.java b/core/src/main/java/noppes/npcs/constants/EnumDayTime.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumDayTime.java rename to core/src/main/java/noppes/npcs/constants/EnumDayTime.java diff --git a/src/main/java/noppes/npcs/constants/EnumDiagramLayout.java b/core/src/main/java/noppes/npcs/constants/EnumDiagramLayout.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumDiagramLayout.java rename to core/src/main/java/noppes/npcs/constants/EnumDiagramLayout.java diff --git a/src/main/java/noppes/npcs/constants/EnumGuiType.java b/core/src/main/java/noppes/npcs/constants/EnumGuiType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumGuiType.java rename to core/src/main/java/noppes/npcs/constants/EnumGuiType.java diff --git a/src/main/java/noppes/npcs/constants/EnumJobType.java b/core/src/main/java/noppes/npcs/constants/EnumJobType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumJobType.java rename to core/src/main/java/noppes/npcs/constants/EnumJobType.java diff --git a/src/main/java/noppes/npcs/constants/EnumMovingType.java b/core/src/main/java/noppes/npcs/constants/EnumMovingType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumMovingType.java rename to core/src/main/java/noppes/npcs/constants/EnumMovingType.java diff --git a/src/main/java/noppes/npcs/constants/EnumNavType.java b/core/src/main/java/noppes/npcs/constants/EnumNavType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumNavType.java rename to core/src/main/java/noppes/npcs/constants/EnumNavType.java diff --git a/src/main/java/noppes/npcs/constants/EnumNpcToolMaterial.java b/core/src/main/java/noppes/npcs/constants/EnumNpcToolMaterial.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumNpcToolMaterial.java rename to core/src/main/java/noppes/npcs/constants/EnumNpcToolMaterial.java diff --git a/src/main/java/noppes/npcs/constants/EnumOptionType.java b/core/src/main/java/noppes/npcs/constants/EnumOptionType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumOptionType.java rename to core/src/main/java/noppes/npcs/constants/EnumOptionType.java diff --git a/src/main/java/noppes/npcs/constants/EnumParticleType.java b/core/src/main/java/noppes/npcs/constants/EnumParticleType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumParticleType.java rename to core/src/main/java/noppes/npcs/constants/EnumParticleType.java diff --git a/src/main/java/noppes/npcs/constants/EnumPartyExchange.java b/core/src/main/java/noppes/npcs/constants/EnumPartyExchange.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumPartyExchange.java rename to core/src/main/java/noppes/npcs/constants/EnumPartyExchange.java diff --git a/src/main/java/noppes/npcs/constants/EnumPartyObjectives.java b/core/src/main/java/noppes/npcs/constants/EnumPartyObjectives.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumPartyObjectives.java rename to core/src/main/java/noppes/npcs/constants/EnumPartyObjectives.java diff --git a/src/main/java/noppes/npcs/constants/EnumPartyRequirements.java b/core/src/main/java/noppes/npcs/constants/EnumPartyRequirements.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumPartyRequirements.java rename to core/src/main/java/noppes/npcs/constants/EnumPartyRequirements.java diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerData.java b/core/src/main/java/noppes/npcs/constants/EnumPlayerData.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumPlayerData.java rename to core/src/main/java/noppes/npcs/constants/EnumPlayerData.java diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/core/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumPlayerPacket.java rename to core/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java diff --git a/src/main/java/noppes/npcs/constants/EnumProfileSync.java b/core/src/main/java/noppes/npcs/constants/EnumProfileSync.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumProfileSync.java rename to core/src/main/java/noppes/npcs/constants/EnumProfileSync.java diff --git a/src/main/java/noppes/npcs/constants/EnumQuestCompletion.java b/core/src/main/java/noppes/npcs/constants/EnumQuestCompletion.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumQuestCompletion.java rename to core/src/main/java/noppes/npcs/constants/EnumQuestCompletion.java diff --git a/src/main/java/noppes/npcs/constants/EnumQuestRepeat.java b/core/src/main/java/noppes/npcs/constants/EnumQuestRepeat.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumQuestRepeat.java rename to core/src/main/java/noppes/npcs/constants/EnumQuestRepeat.java diff --git a/src/main/java/noppes/npcs/constants/EnumQuestType.java b/core/src/main/java/noppes/npcs/constants/EnumQuestType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumQuestType.java rename to core/src/main/java/noppes/npcs/constants/EnumQuestType.java diff --git a/src/main/java/noppes/npcs/constants/EnumRoleType.java b/core/src/main/java/noppes/npcs/constants/EnumRoleType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumRoleType.java rename to core/src/main/java/noppes/npcs/constants/EnumRoleType.java diff --git a/src/main/java/noppes/npcs/constants/EnumScriptType.java b/core/src/main/java/noppes/npcs/constants/EnumScriptType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumScriptType.java rename to core/src/main/java/noppes/npcs/constants/EnumScriptType.java diff --git a/src/main/java/noppes/npcs/constants/EnumScrollData.java b/core/src/main/java/noppes/npcs/constants/EnumScrollData.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumScrollData.java rename to core/src/main/java/noppes/npcs/constants/EnumScrollData.java diff --git a/src/main/java/noppes/npcs/constants/EnumStandingType.java b/core/src/main/java/noppes/npcs/constants/EnumStandingType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumStandingType.java rename to core/src/main/java/noppes/npcs/constants/EnumStandingType.java diff --git a/core/src/main/java/noppes/npcs/constants/EnumStockReset.java b/core/src/main/java/noppes/npcs/constants/EnumStockReset.java new file mode 100644 index 000000000..c66abdb78 --- /dev/null +++ b/core/src/main/java/noppes/npcs/constants/EnumStockReset.java @@ -0,0 +1,81 @@ +package noppes.npcs.constants; + +/** + * Stock reset types for Trader NPCs. + * Mirrors EnumQuestRepeat pattern for consistency. + */ +public enum EnumStockReset { + NONE("stock.reset.never"), + MCDAILY("stock.reset.mcdaily"), + MCWEEKLY("stock.reset.mcweekly"), + MCCUSTOM("stock.reset.mccustom"), + RLDAILY("stock.reset.rldaily"), + RLWEEKLY("stock.reset.rlweekly"), + RLCUSTOM("stock.reset.rlcustom"); + + private final String langKey; + + EnumStockReset(String langKey) { + this.langKey = langKey; + } + + /** + * Get the language key for localization. + */ + public String getLangKey() { + return langKey; + } + + /** + * Get reset interval in milliseconds for real-time types + * or ticks for MC-time types + */ + public long getDefaultInterval() { + switch (this) { + case MCDAILY: + return 24000; // MC ticks + case MCWEEKLY: + return 168000; // MC ticks (7 days) + case RLDAILY: + return 86400000L; // 24 hours in ms + case RLWEEKLY: + return 604800000L; // 7 days in ms + default: + return 0; + } + } + + /** + * Check if this reset type uses real-world time + */ + public boolean isRealTime() { + return this == RLDAILY || this == RLWEEKLY || this == RLCUSTOM; + } + + /** + * Check if this reset type uses Minecraft time + */ + public boolean isMinecraftTime() { + return this == MCDAILY || this == MCWEEKLY || this == MCCUSTOM; + } + + /** + * Get display name - returns the lang key for platform-specific translation. + */ + public String getDisplayName() { + return langKey; + } + + /** + * Get all lang keys for dropdown menus. + * Platform code should translate these via the version-specific localization system. + */ + public static String[] getDisplayNames() { + EnumStockReset[] values = values(); + String[] names = new String[values.length]; + for (int i = 0; i < values.length; i++) { + names[i] = values[i].langKey; + } + return names; + } +} diff --git a/src/main/java/noppes/npcs/constants/EnumTextureType.java b/core/src/main/java/noppes/npcs/constants/EnumTextureType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumTextureType.java rename to core/src/main/java/noppes/npcs/constants/EnumTextureType.java diff --git a/src/main/java/noppes/npcs/constants/EnumTradeSlotType.java b/core/src/main/java/noppes/npcs/constants/EnumTradeSlotType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/EnumTradeSlotType.java rename to core/src/main/java/noppes/npcs/constants/EnumTradeSlotType.java diff --git a/src/main/java/noppes/npcs/constants/MarkType.java b/core/src/main/java/noppes/npcs/constants/MarkType.java similarity index 100% rename from src/main/java/noppes/npcs/constants/MarkType.java rename to core/src/main/java/noppes/npcs/constants/MarkType.java diff --git a/core/src/main/java/noppes/npcs/constants/NBTTypes.java b/core/src/main/java/noppes/npcs/constants/NBTTypes.java new file mode 100644 index 000000000..2385b5dcb --- /dev/null +++ b/core/src/main/java/noppes/npcs/constants/NBTTypes.java @@ -0,0 +1,26 @@ +package noppes.npcs.constants; + +/** + * NBT type ID constants, matching Minecraft's internal NBT type numbering. + * These are stable across all MC versions. + * + * Use these instead of magic numbers when calling INBTCompound.hasKey(key, type) + * or INBTCompound.getList(key, type). + */ +public final class NBTTypes { + + public static final int TAG_END = 0; + public static final int TAG_BYTE = 1; + public static final int TAG_SHORT = 2; + public static final int TAG_INT = 3; + public static final int TAG_LONG = 4; + public static final int TAG_FLOAT = 5; + public static final int TAG_DOUBLE = 6; + public static final int TAG_BYTE_ARRAY = 7; + public static final int TAG_STRING = 8; + public static final int TAG_LIST = 9; + public static final int TAG_COMPOUND = 10; + public static final int TAG_INT_ARRAY = 11; + + private NBTTypes() {} +} diff --git a/src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java b/core/src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java similarity index 77% rename from src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java rename to core/src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java index 7941c81f1..9f466a94f 100644 --- a/src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java +++ b/core/src/main/java/noppes/npcs/controllers/data/AbilityHotbarData.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; public class AbilityHotbarData { public static final String CHAIN_PREFIX = "chain:"; @@ -25,15 +26,15 @@ public class AbilityHotbarData { return abilityKey; } - public NBTTagCompound writeToNBT(NBTTagCompound compound) { - NBTTagCompound tag = new NBTTagCompound(); + public INBTCompound writeToNBT(INBTCompound compound) { + INBTCompound tag = NBT.compound(); tag.setInteger("slot", slot); tag.setString("abilityKey", abilityKey != null ? abilityKey : ""); - compound.setTag("AbilityHotbar" + slot, tag); + compound.setCompound("AbilityHotbar" + slot, tag); return compound; } - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { abilityKey = compound.getString("abilityKey"); } diff --git a/src/main/java/noppes/npcs/controllers/data/Category.java b/core/src/main/java/noppes/npcs/controllers/data/Category.java similarity index 76% rename from src/main/java/noppes/npcs/controllers/data/Category.java rename to core/src/main/java/noppes/npcs/controllers/data/Category.java index cbab80085..34cfd192e 100644 --- a/src/main/java/noppes/npcs/controllers/data/Category.java +++ b/core/src/main/java/noppes/npcs/controllers/data/Category.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; /** * Simple category data class for the generic category system. @@ -18,12 +19,12 @@ public class Category { this.title = title; } - public void readNBT(NBTTagCompound compound) { + public void readNBT(INBTCompound compound) { id = compound.getInteger("CatID"); title = compound.getString("CatTitle"); } - public NBTTagCompound writeNBT(NBTTagCompound compound) { + public INBTCompound writeNBT(INBTCompound compound) { compound.setInteger("CatID", id); compound.setString("CatTitle", title); return compound; diff --git a/src/main/java/noppes/npcs/controllers/data/CloneFolder.java b/core/src/main/java/noppes/npcs/controllers/data/CloneFolder.java similarity index 89% rename from src/main/java/noppes/npcs/controllers/data/CloneFolder.java rename to core/src/main/java/noppes/npcs/controllers/data/CloneFolder.java index d2d0c7bcf..a83aec391 100644 --- a/src/main/java/noppes/npcs/controllers/data/CloneFolder.java +++ b/core/src/main/java/noppes/npcs/controllers/data/CloneFolder.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; public class CloneFolder { public String name; @@ -16,12 +17,12 @@ public class CloneFolder { this.createdDate = System.currentTimeMillis(); } - public void readNBT(NBTTagCompound compound) { + public void readNBT(INBTCompound compound) { name = compound.getString("Name"); createdDate = compound.getLong("Created"); } - public NBTTagCompound writeNBT(NBTTagCompound compound) { + public INBTCompound writeNBT(INBTCompound compound) { compound.setString("Name", name); compound.setLong("Created", createdDate); return compound; diff --git a/src/main/java/noppes/npcs/controllers/data/DialogColorData.java b/core/src/main/java/noppes/npcs/controllers/data/DialogColorData.java similarity index 93% rename from src/main/java/noppes/npcs/controllers/data/DialogColorData.java rename to core/src/main/java/noppes/npcs/controllers/data/DialogColorData.java index 0b7a6114f..e0693a907 100644 --- a/src/main/java/noppes/npcs/controllers/data/DialogColorData.java +++ b/core/src/main/java/noppes/npcs/controllers/data/DialogColorData.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; public class DialogColorData { private boolean enableColorSettings = false; @@ -11,7 +12,7 @@ public class DialogColorData { private int buttonAcceptColor = 0xfff96605; private int buttonRejectColor = 0xfff96605; - public NBTTagCompound writeToNBT(NBTTagCompound compound) { + public INBTCompound writeToNBT(INBTCompound compound) { compound.setBoolean("ColorSettings", enableColorSettings); if (enableColorSettings) { compound.setInteger("LineColor1", lineColor1); @@ -24,7 +25,7 @@ public class DialogColorData { return compound; } - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { this.enableColorSettings = compound.getBoolean("ColorSettings"); if (enableColorSettings) { lineColor1 = compound.getInteger("LineColor1"); diff --git a/src/main/java/noppes/npcs/controllers/data/DialogImage.java b/core/src/main/java/noppes/npcs/controllers/data/DialogImage.java similarity index 88% rename from src/main/java/noppes/npcs/controllers/data/DialogImage.java rename to core/src/main/java/noppes/npcs/controllers/data/DialogImage.java index 8481b32a9..7a57ded46 100644 --- a/src/main/java/noppes/npcs/controllers/data/DialogImage.java +++ b/core/src/main/java/noppes/npcs/controllers/data/DialogImage.java @@ -1,7 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.handler.data.IDialogImage; +import noppes.npcs.platform.nbt.INBTCompound; public class DialogImage implements IDialogImage { public int id; @@ -29,7 +29,7 @@ public class DialogImage implements IDialogImage { this.id = id; } - public NBTTagCompound writeToNBT(NBTTagCompound compound) { + public INBTCompound writeToNBT(INBTCompound compound) { compound.setInteger("ID", id); compound.setString("Texture", texture); compound.setInteger("PosX", x); @@ -49,7 +49,7 @@ public class DialogImage implements IDialogImage { return compound; } - public void readNBT(NBTTagCompound compound) { + public void readNBT(INBTCompound compound) { id = compound.getInteger("ID"); texture = compound.getString("Texture"); x = compound.getInteger("PosX"); @@ -67,135 +67,109 @@ public class DialogImage implements IDialogImage { alignment = compound.getInteger("Alignment"); } - @Override public int getId() { return id; } - @Override public void setTexture(String texture) { this.texture = texture; } - @Override public String getTexture() { return texture; } - @Override public void setPosition(int x, int y) { this.x = x; this.y = y; } - @Override public int getX() { return x; } - @Override public int getY() { return y; } - @Override public void setWidthHeight(int width, int height) { this.width = width; this.height = height; } - @Override public int getWidth() { return width; } - @Override public int getHeight() { return height; } - @Override public void setTextureOffset(int offsetX, int offsetY) { this.textureX = offsetX; this.textureY = offsetY; } - @Override public int getTextureX() { return textureX; } - @Override public int getTextureY() { return textureY; } - @Override public void setColor(int color) { this.color = color; } - @Override public int getColor() { return color; } - @Override public void setSelectedColor(int color) { this.selectedColor = color; } - @Override public int getSelectedColor() { return selectedColor; } - @Override public void setScale(float scale) { this.scale = scale; } - @Override public float getScale() { return scale; } - @Override public void setAlpha(float alpha) { this.alpha = alpha; } - @Override public float getAlpha() { return alpha; } - @Override public void setRotation(float rotation) { this.rotation = rotation; } - @Override public float getRotation() { return rotation; } - @Override public void setImageType(int imageType) { this.imageType = imageType; } - @Override public int getImageType() { return imageType; } - @Override public void setAlignment(int alignment) { this.alignment = alignment; } - @Override public int getAlignment() { return alignment; } diff --git a/src/main/java/noppes/npcs/controllers/data/EffectKey.java b/core/src/main/java/noppes/npcs/controllers/data/EffectKey.java similarity index 100% rename from src/main/java/noppes/npcs/controllers/data/EffectKey.java rename to core/src/main/java/noppes/npcs/controllers/data/EffectKey.java diff --git a/src/main/java/noppes/npcs/controllers/data/InnDoorData.java b/core/src/main/java/noppes/npcs/controllers/data/InnDoorData.java similarity index 100% rename from src/main/java/noppes/npcs/controllers/data/InnDoorData.java rename to core/src/main/java/noppes/npcs/controllers/data/InnDoorData.java diff --git a/src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java b/core/src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java similarity index 90% rename from src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java rename to core/src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java index c26edbf0c..a57a70aa0 100644 --- a/src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java +++ b/core/src/main/java/noppes/npcs/controllers/data/ItemDisplayData.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; public class ItemDisplayData { public String texture = "minecraft:textures/items/iron_pickaxe.png"; @@ -17,13 +18,13 @@ public class ItemDisplayData { public Integer frameCount = 1; public Integer frametime = 2; - public NBTTagCompound writeToNBT() { - NBTTagCompound compound = new NBTTagCompound(); + public INBTCompound writeToNBT() { + INBTCompound compound = NBT.compound(); this.writeToNBT(compound); return compound; } - public NBTTagCompound writeToNBT(NBTTagCompound compound) { + public INBTCompound writeToNBT(INBTCompound compound) { this.setBoolean(compound, "DurabilityShow", this.durabilityShow); this.setInteger(compound, "DurabilityColor", this.durabilityColor); this.setInteger(compound, "ItemColor", this.itemColor); @@ -54,7 +55,7 @@ public class ItemDisplayData { return compound; } - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { if (compound.hasKey("DurabilityShow")) { this.durabilityShow = compound.getBoolean("DurabilityShow"); } @@ -118,19 +119,19 @@ public class ItemDisplayData { } } - private void setBoolean(NBTTagCompound compound, String key, Boolean value) { + private void setBoolean(INBTCompound compound, String key, Boolean value) { if (value != null) { compound.setBoolean(key, value); } } - private void setInteger(NBTTagCompound compound, String key, Integer value) { + private void setInteger(INBTCompound compound, String key, Integer value) { if (value != null) { compound.setInteger(key, value); } } - private void setFloat(NBTTagCompound compound, String key, Float value) { + private void setFloat(INBTCompound compound, String key, Float value) { if (value != null) { compound.setFloat(key, value); } diff --git a/src/main/java/noppes/npcs/controllers/data/MagicAssociation.java b/core/src/main/java/noppes/npcs/controllers/data/MagicAssociation.java similarity index 100% rename from src/main/java/noppes/npcs/controllers/data/MagicAssociation.java rename to core/src/main/java/noppes/npcs/controllers/data/MagicAssociation.java diff --git a/src/main/java/noppes/npcs/controllers/data/MagicCycle.java b/core/src/main/java/noppes/npcs/controllers/data/MagicCycle.java similarity index 79% rename from src/main/java/noppes/npcs/controllers/data/MagicCycle.java rename to core/src/main/java/noppes/npcs/controllers/data/MagicCycle.java index 23bffc97d..12557124e 100644 --- a/src/main/java/noppes/npcs/controllers/data/MagicCycle.java +++ b/core/src/main/java/noppes/npcs/controllers/data/MagicCycle.java @@ -1,8 +1,9 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.handler.data.IMagicCycle; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.core.NBT; import noppes.npcs.constants.EnumDiagramLayout; import java.util.HashMap; @@ -21,15 +22,15 @@ public class MagicCycle implements IMagicCycle { public MagicCycle() { } - public void readNBT(NBTTagCompound compound) { + public void readNBT(INBTCompound compound) { id = compound.getInteger("ID"); name = compound.getString("Name"); displayName = compound.getString("DisplayName"); layout = EnumDiagramLayout.values()[compound.getInteger("Layout")]; associations.clear(); - NBTTagList list = compound.getTagList("Associations", 10); // compound tags - for (int i = 0; i < list.tagCount(); i++) { - NBTTagCompound assocTag = list.getCompoundTagAt(i); + INBTList list = compound.getList("Associations", 10); // compound tags + for (int i = 0; i < list.size(); i++) { + INBTCompound assocTag = list.getCompound(i); MagicAssociation assoc = new MagicAssociation(); assoc.magicId = assocTag.getInteger("MagicID"); assoc.index = assocTag.getInteger("Index"); @@ -38,43 +39,38 @@ public class MagicCycle implements IMagicCycle { } } - public void writeNBT(NBTTagCompound compound) { + public void writeNBT(INBTCompound compound) { compound.setInteger("ID", id); compound.setString("Name", name); compound.setString("DisplayName", displayName); compound.setInteger("Layout", layout.ordinal()); - NBTTagList list = new NBTTagList(); + INBTList list = NBT.list(); for (MagicAssociation assoc : associations.values()) { - NBTTagCompound assocTag = new NBTTagCompound(); + INBTCompound assocTag = NBT.compound(); assocTag.setInteger("MagicID", assoc.magicId); assocTag.setInteger("Index", assoc.index); assocTag.setInteger("Priority", assoc.priority); - list.appendTag(assocTag); + list.addCompound(assocTag); } - compound.setTag("Associations", list); + compound.setList("Associations", list); } - @Override public int getId() { return id; } - @Override public String getName() { return name; } - @Override public void setName(String name) { this.name = name; } - @Override public String getDisplayName() { return displayName; } - @Override public void setDisplayName(String displayName) { this.displayName = displayName; } @@ -83,7 +79,6 @@ public class MagicCycle implements IMagicCycle { return layout; } - @Override public int getLayoutType() { return layout.ordinal(); } @@ -92,7 +87,6 @@ public class MagicCycle implements IMagicCycle { this.layout = layout; } - @Override public void setLayoutType(int layout) { if (layout < 0 || layout > EnumDiagramLayout.values().length - 1) return; diff --git a/src/main/java/noppes/npcs/controllers/data/MagicData.java b/core/src/main/java/noppes/npcs/controllers/data/MagicData.java similarity index 72% rename from src/main/java/noppes/npcs/controllers/data/MagicData.java rename to core/src/main/java/noppes/npcs/controllers/data/MagicData.java index f70e6ec75..de23ba81f 100644 --- a/src/main/java/noppes/npcs/controllers/data/MagicData.java +++ b/core/src/main/java/noppes/npcs/controllers/data/MagicData.java @@ -1,30 +1,31 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.handler.data.IMagicData; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; import java.util.HashMap; public class MagicData implements IMagicData { private final HashMap magics = new HashMap<>(); - public void writeToNBT(NBTTagCompound compound) { - NBTTagCompound magicData = new NBTTagCompound(); + public void writeToNBT(INBTCompound compound) { + INBTCompound magicData = NBT.compound(); for (int key : magics.keySet()) { - magicData.setTag(String.valueOf(key), magics.get(key).writeToNBT()); + magicData.setCompound(String.valueOf(key), magics.get(key).writeToNBT()); } - compound.setTag("MagicData", magicData); + compound.setCompound("MagicData", magicData); } - public void readToNBT(NBTTagCompound compound) { - NBTTagCompound magicData = compound.getCompoundTag("MagicData"); + public void readToNBT(INBTCompound compound) { + INBTCompound magicData = compound.getCompound("MagicData"); magics.clear(); if (magicData == null) return; - for (Object key : magicData.func_150296_c()) { - int i = Integer.parseInt((String) key); + for (String key : magicData.getKeySet()) { + int i = Integer.parseInt(key); MagicEntry entry = new MagicEntry(); - entry.readToNBT(magicData.getCompoundTag((String) key)); + entry.readToNBT(magicData.getCompound(key)); magics.put(i, entry); } } @@ -33,12 +34,10 @@ public class MagicData implements IMagicData { return magics.get(id); } - @Override public void removeMagic(int id) { magics.remove(id); } - @Override public boolean hasMagic(int id) { return magics.containsKey(id); } @@ -47,17 +46,14 @@ public class MagicData implements IMagicData { return magics; } - @Override public void clear() { magics.clear(); } - @Override public boolean isEmpty() { return magics.isEmpty(); } - @Override public void addMagic(int id, float damage, float split) { MagicEntry entry = new MagicEntry(); entry.damage = damage; @@ -65,13 +61,11 @@ public class MagicData implements IMagicData { magics.put(id, entry); } - @Override public float getMagicDamage(int id) { MagicEntry entry = magics.get(id); return entry == null ? 0 : entry.damage; } - @Override public float getMagicSplit(int id) { MagicEntry entry = magics.get(id); return entry == null ? 0 : entry.split; diff --git a/src/main/java/noppes/npcs/controllers/data/MagicEntry.java b/core/src/main/java/noppes/npcs/controllers/data/MagicEntry.java similarity index 60% rename from src/main/java/noppes/npcs/controllers/data/MagicEntry.java rename to core/src/main/java/noppes/npcs/controllers/data/MagicEntry.java index ec216256d..1fc661d71 100644 --- a/src/main/java/noppes/npcs/controllers/data/MagicEntry.java +++ b/core/src/main/java/noppes/npcs/controllers/data/MagicEntry.java @@ -1,19 +1,20 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; public class MagicEntry { public float damage; public float split; - public NBTTagCompound writeToNBT() { - NBTTagCompound compound = new NBTTagCompound(); + public INBTCompound writeToNBT() { + INBTCompound compound = NBT.compound(); compound.setFloat("Dmg", damage); compound.setFloat("Split", split); return compound; } - public void readToNBT(NBTTagCompound compound) { + public void readToNBT(INBTCompound compound) { damage = compound.getFloat("Dmg"); split = compound.getFloat("Split"); } diff --git a/src/main/java/noppes/npcs/controllers/data/ProfileOptions.java b/core/src/main/java/noppes/npcs/controllers/data/ProfileOptions.java similarity index 90% rename from src/main/java/noppes/npcs/controllers/data/ProfileOptions.java rename to core/src/main/java/noppes/npcs/controllers/data/ProfileOptions.java index 231f42451..34ea95f8b 100644 --- a/src/main/java/noppes/npcs/controllers/data/ProfileOptions.java +++ b/core/src/main/java/noppes/npcs/controllers/data/ProfileOptions.java @@ -1,7 +1,8 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.handler.data.IProfileOptions; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.core.NBT; import noppes.npcs.constants.EnumProfileSync; public class ProfileOptions implements IProfileOptions { @@ -10,7 +11,7 @@ public class ProfileOptions implements IProfileOptions { public EnumProfileSync cooldownControl = EnumProfileSync.Individual; public EnumProfileSync completeControl = EnumProfileSync.Individual; - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { // Party Management enableOptions = compound.getBoolean("EnableProfiles"); if (enableOptions) { @@ -29,8 +30,8 @@ public class ProfileOptions implements IProfileOptions { } } - public NBTTagCompound writeToNBT() { - NBTTagCompound compound = new NBTTagCompound(); + public INBTCompound writeToNBT() { + INBTCompound compound = NBT.compound(); compound.setBoolean("EnableProfiles", enableOptions); if (enableOptions) { compound.setInteger("CooldownControl", cooldownControl.ordinal()); @@ -47,17 +48,14 @@ public class ProfileOptions implements IProfileOptions { return compound; } - @Override public boolean hasProfileOptions() { return enableOptions; } - @Override public void setProfileOptions(boolean enable) { this.enableOptions = enable; } - @Override public void setCooldownControl(int profileType) { if (profileType < 0 || profileType >= EnumProfileSync.values().length) { return; @@ -65,12 +63,10 @@ public class ProfileOptions implements IProfileOptions { this.cooldownControl = EnumProfileSync.values()[profileType]; } - @Override public int getCooldownControl() { return this.cooldownControl.ordinal(); } - @Override public void setCompleteControl(int profileType) { if (profileType < 0 || profileType >= EnumProfileSync.values().length) { return; @@ -78,7 +74,6 @@ public class ProfileOptions implements IProfileOptions { this.completeControl = EnumProfileSync.values()[profileType]; } - @Override public int getCompleteControl() { return this.completeControl.ordinal(); } diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/core/src/main/java/noppes/npcs/controllers/data/TagMap.java similarity index 71% rename from src/main/java/noppes/npcs/controllers/data/TagMap.java rename to core/src/main/java/noppes/npcs/controllers/data/TagMap.java index 2205d96fd..70249a24e 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/core/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -1,8 +1,8 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.core.NBT; import java.util.ArrayList; import java.util.Collections; @@ -28,18 +28,18 @@ public class TagMap { this.tagMap = new HashMap>(); } - public void readNBT(NBTTagCompound compound) { + public void readNBT(INBTCompound compound) { this.tagMap = new HashMap>(); - NBTTagList list = compound.getTagList("TagMap", 10); + INBTList list = compound.getList("TagMap", 10); if (list != null) { - for (int i = 0; i < list.tagCount(); i++) { - NBTTagCompound nbttagcompound = list.getCompoundTagAt(i); + for (int i = 0; i < list.size(); i++) { + INBTCompound nbttagcompound = list.getCompound(i); String cloneName = nbttagcompound.getString("Clone"); HashSet uuids = new HashSet(); - NBTTagList nbtTagList = nbttagcompound.getTagList("TagUUIDs", 8); - for (int j = 0; j < nbtTagList.tagCount(); j++) { - String uuid = nbtTagList.getStringTagAt(j); + INBTList nbtTagList = nbttagcompound.getList("TagUUIDs", 8); + for (int j = 0; j < nbtTagList.size(); j++) { + String uuid = nbtTagList.getString(j); if (!uuid.isEmpty()) { uuids.add(UUID.fromString(uuid)); } @@ -49,23 +49,23 @@ public class TagMap { } } - public NBTTagCompound writeNBT() { - NBTTagCompound nbt = new NBTTagCompound(); - NBTTagList cloneList = new NBTTagList(); + public INBTCompound writeNBT() { + INBTCompound nbt = NBT.compound(); + INBTList cloneList = NBT.list(); for (String key : tagMap.keySet()) { HashSet uuidSet = tagMap.get(key); if (uuidSet.size() > 0) { - NBTTagCompound cloneCompound = new NBTTagCompound(); + INBTCompound cloneCompound = NBT.compound(); cloneCompound.setString("Clone", key); - NBTTagList nbtTagList = new NBTTagList(); + INBTList nbtTagList = NBT.list(); for (UUID uuid : uuidSet) { - nbtTagList.appendTag(new NBTTagString(uuid.toString())); + nbtTagList.addString(uuid.toString()); } - cloneCompound.setTag("TagUUIDs", nbtTagList); - cloneList.appendTag(cloneCompound); + cloneCompound.setList("TagUUIDs", nbtTagList); + cloneList.addCompound(cloneCompound); } } - nbt.setTag("TagMap", cloneList); + nbt.setList("TagMap", cloneList); return nbt; } diff --git a/src/main/java/noppes/npcs/controllers/data/TintData.java b/core/src/main/java/noppes/npcs/controllers/data/TintData.java similarity index 93% rename from src/main/java/noppes/npcs/controllers/data/TintData.java rename to core/src/main/java/noppes/npcs/controllers/data/TintData.java index 1471d967a..5534bf7c8 100644 --- a/src/main/java/noppes/npcs/controllers/data/TintData.java +++ b/core/src/main/java/noppes/npcs/controllers/data/TintData.java @@ -1,7 +1,7 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.entity.data.ITintData; +import noppes.npcs.platform.nbt.INBTCompound; public class TintData implements ITintData { private boolean tintEnabled = false; @@ -11,7 +11,7 @@ public class TintData implements ITintData { private int generalTint = 0x000000; private int generalAlpha = 40; - public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + public INBTCompound writeToNBT(INBTCompound nbttagcompound) { nbttagcompound.setBoolean("TintEnabled", tintEnabled); if (tintEnabled) { nbttagcompound.setBoolean("HurtTintEnabled", hurtTintEnabled); @@ -23,7 +23,7 @@ public class TintData implements ITintData { return nbttagcompound; } - public void readFromNBT(NBTTagCompound nbttagcompound) { + public void readFromNBT(INBTCompound nbttagcompound) { tintEnabled = nbttagcompound.getBoolean("TintEnabled"); if (tintEnabled) { hurtTintEnabled = nbttagcompound.getBoolean("HurtTintEnabled"); diff --git a/src/main/java/noppes/npcs/controllers/data/TraderStock.java b/core/src/main/java/noppes/npcs/controllers/data/TraderStock.java similarity index 94% rename from src/main/java/noppes/npcs/controllers/data/TraderStock.java rename to core/src/main/java/noppes/npcs/controllers/data/TraderStock.java index 85e76ec02..730a5533f 100644 --- a/src/main/java/noppes/npcs/controllers/data/TraderStock.java +++ b/core/src/main/java/noppes/npcs/controllers/data/TraderStock.java @@ -1,7 +1,8 @@ package noppes.npcs.controllers.data; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.core.NBT; import noppes.npcs.constants.EnumStockReset; import java.util.HashMap; @@ -265,7 +266,7 @@ public class TraderStock { // ==================== NBT Serialization ==================== - public NBTTagCompound writeToNBT(NBTTagCompound compound) { + public INBTCompound writeToNBT(INBTCompound compound) { compound.setBoolean("EnableStock", enableStock); compound.setBoolean("PerPlayer", perPlayer); compound.setInteger("ResetType", resetType.ordinal()); @@ -275,19 +276,19 @@ public class TraderStock { compound.setLong("LastResetTime", lastResetTime); // Save per-player stock - NBTTagList playerList = new NBTTagList(); + INBTList playerList = NBT.list(); for (Map.Entry entry : playerStock.entrySet()) { - NBTTagCompound playerTag = new NBTTagCompound(); + INBTCompound playerTag = NBT.compound(); playerTag.setString("Player", entry.getKey()); entry.getValue().writeToNBT(playerTag); - playerList.appendTag(playerTag); + playerList.addCompound(playerTag); } - compound.setTag("PlayerStock", playerList); + compound.setList("PlayerStock", playerList); return compound; } - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { enableStock = compound.getBoolean("EnableStock"); perPlayer = compound.getBoolean("PerPlayer"); @@ -312,9 +313,9 @@ public class TraderStock { // Load per-player stock playerStock.clear(); - NBTTagList playerList = compound.getTagList("PlayerStock", 10); - for (int i = 0; i < playerList.tagCount(); i++) { - NBTTagCompound playerTag = playerList.getCompoundTagAt(i); + INBTList playerList = compound.getList("PlayerStock", 10); + for (int i = 0; i < playerList.size(); i++) { + INBTCompound playerTag = playerList.getCompound(i); String playerName = playerTag.getString("Player"); PlayerTraderStock pStock = new PlayerTraderStock(); pStock.readFromNBT(playerTag); @@ -347,11 +348,11 @@ public class TraderStock { return false; } - public void writeToNBT(NBTTagCompound compound) { + public void writeToNBT(INBTCompound compound) { compound.setIntArray("Purchased", purchasedAmounts); } - public void readFromNBT(NBTTagCompound compound) { + public void readFromNBT(INBTCompound compound) { int[] loaded = compound.getIntArray("Purchased"); if (loaded != null && loaded.length == 18) { purchasedAmounts = loaded; diff --git a/core/src/main/java/noppes/npcs/core/NBT.java b/core/src/main/java/noppes/npcs/core/NBT.java new file mode 100644 index 000000000..15c3b5f01 --- /dev/null +++ b/core/src/main/java/noppes/npcs/core/NBT.java @@ -0,0 +1,28 @@ +package noppes.npcs.core; + +import noppes.npcs.platform.PlatformServiceHolder; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; + +/** + * Convenience factory for creating NBT objects in CORE code. + * Shorthand for PlatformServiceHolder.get().nbt().createCompound(), etc. + */ +public final class NBT { + + private NBT() {} + + /** + * Creates a new, empty NBT compound. + */ + public static INBTCompound compound() { + return PlatformServiceHolder.get().nbt().createCompound(); + } + + /** + * Creates a new, empty NBT list. + */ + public static INBTList list() { + return PlatformServiceHolder.get().nbt().createList(); + } +} diff --git a/core/src/main/java/noppes/npcs/core/package-info.java b/core/src/main/java/noppes/npcs/core/package-info.java new file mode 100644 index 000000000..e75ebad6a --- /dev/null +++ b/core/src/main/java/noppes/npcs/core/package-info.java @@ -0,0 +1,12 @@ +/** + * CustomNPC+ Core Module. + * + * This package contains version-independent game logic that is shared across + * all Minecraft versions (1.7.10, 1.12, 1.16, 1.20.1). + * + * Rules: + * - NO imports from net.minecraft.*, cpw.mods.*, net.minecraftforge.*, org.spongepowered.* + * - Only java.*, javax.*, noppes.npcs.core.*, noppes.npcs.platform.*, kamkeel.npcs.core.* + * - All MC-specific behavior is accessed through noppes.npcs.platform.PlatformServiceHolder + */ +package noppes.npcs.core; diff --git a/dependencies.gradle b/dependencies.gradle index dce55cad2..a99991c32 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,6 +35,10 @@ */ def embedMixin = !project.hasProperty("nomixin"); dependencies { + // CNPC+ Core: version-independent game logic (data classes, controllers, constants) + // Transitively includes platform-api (bridge interfaces for NBT, config, etc.) + implementation project(':core') + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.44-GTNH:dev") if (!project.hasProperty("noNashorn")) { runtimeOnlyNonPublishable("curse.maven:Nashorn-374413:2924946") diff --git a/platform-api/build.gradle b/platform-api/build.gradle new file mode 100644 index 000000000..86d857db4 --- /dev/null +++ b/platform-api/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java-library' +} + +group = 'noppes.npcs' +version = '1.0' + +// Target Java 8 for compatibility with all MC versions (1.7.10 through 1.20.1) +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} diff --git a/platform-api/src/main/java/noppes/npcs/api/entity/data/ITintData.java b/platform-api/src/main/java/noppes/npcs/api/entity/data/ITintData.java new file mode 100644 index 000000000..1787b18e3 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/api/entity/data/ITintData.java @@ -0,0 +1,94 @@ +package noppes.npcs.api.entity.data; + +/** + * Provides configuration data for an NPC's color tinting effects. + *

+ * Controls both the hurt tint (flash color when damaged) and a persistent + * general tint overlay applied to the NPC's model. + */ +public interface ITintData { + + /** + * Returns whether the tint system is enabled. + * + * @return true if tinting is enabled, false otherwise. + */ + boolean isTintEnabled(); + + /** + * Sets whether the tint system is enabled. + * + * @param enabled true to enable, false to disable. + */ + void setTintEnabled(boolean enabled); + + /** + * Returns whether the hurt tint effect is enabled. + * + * @return true if hurt tint is enabled, false otherwise. + */ + boolean isHurtTintEnabled(); + + /** + * Sets whether the hurt tint effect is enabled. + * + * @param enabled true to enable, false to disable. + */ + void setHurtTintEnabled(boolean enabled); + + /** + * Returns whether the general (persistent) tint is enabled. + * + * @return true if general tint is enabled, false otherwise. + */ + boolean isGeneralTintEnabled(); + + /** + * Sets whether the general (persistent) tint is enabled. + * + * @param enabled true to enable, false to disable. + */ + void setGeneralTintEnabled(boolean enabled); + + /** + * Returns the hurt tint color as an RGB integer (e.g. 0xff0000 for red). + * + * @return the hurt tint color. + */ + int getHurtTint(); + + /** + * Sets the hurt tint color as an RGB integer. + * + * @param color the hurt tint color (e.g. 0xff0000 for red). + */ + void setHurtTint(int color); + + /** + * Returns the general tint color as an RGB integer. + * + * @return the general tint color. + */ + int getGeneralTint(); + + /** + * Sets the general tint color as an RGB integer. + * + * @param color the general tint color. + */ + void setGeneralTint(int color); + + /** + * Returns the alpha (opacity) of the general tint overlay (0-255). + * + * @return the general tint alpha value. + */ + int getGeneralAlpha(); + + /** + * Sets the alpha (opacity) of the general tint overlay (0-255). + * + * @param alpha the general tint alpha value. + */ + void setGeneralAlpha(int alpha); +} diff --git a/platform-api/src/main/java/noppes/npcs/api/handler/data/IDialogImage.java b/platform-api/src/main/java/noppes/npcs/api/handler/data/IDialogImage.java new file mode 100644 index 000000000..a446c2e21 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/api/handler/data/IDialogImage.java @@ -0,0 +1,147 @@ +package noppes.npcs.api.handler.data; + +public interface IDialogImage { + /** + * @return The unique ID of this dialog image + */ + int getId(); + + /** + * Sets the texture resource location for this image. + * @param texture The resource location string + */ + void setTexture(String texture); + + /** + * @return The texture resource location for this image + */ + String getTexture(); + + /** + * Sets the screen position of this image. + * @param x The X position in pixels + * @param y The Y position in pixels + */ + void setPosition(int x, int y); + + /** + * @return The X position of this image in pixels + */ + int getX(); + + /** + * @return The Y position of this image in pixels + */ + int getY(); + + /** + * Sets the rendered width and height of this image. + * @param width The width in pixels + * @param height The height in pixels + */ + void setWidthHeight(int width, int height); + + /** + * @return The rendered width of this image in pixels + */ + int getWidth(); + + /** + * @return The rendered height of this image in pixels + */ + int getHeight(); + + /** + * Sets the texture UV offset for this image. + * @param offsetX The horizontal texture offset in pixels + * @param offsetY The vertical texture offset in pixels + */ + void setTextureOffset(int offsetX, int offsetY); + + /** + * @return The horizontal texture UV offset in pixels + */ + int getTextureX(); + + /** + * @return The vertical texture UV offset in pixels + */ + int getTextureY(); + + /** + * Sets the tint color of this image. + * @param color The color as an integer (e.g. 0xFFFFFF) + */ + void setColor(int color); + + /** + * @return The tint color of this image + */ + int getColor(); + + /** + * Sets the tint color used when this image is selected/hovered. + * @param color The selected color as an integer (e.g. 0xFFFFFF) + */ + void setSelectedColor(int color); + + /** + * @return The tint color used when this image is selected/hovered + */ + int getSelectedColor(); + + /** + * Sets the render scale of this image. + * @param scale The scale factor (default 1.0) + */ + void setScale(float scale); + + /** + * @return The render scale of this image + */ + float getScale(); + + /** + * Sets the alpha transparency of this image. + * @param alpha The alpha value from 0.0 (transparent) to 1.0 (opaque) + */ + void setAlpha(float alpha); + + /** + * @return The alpha transparency of this image (0.0 to 1.0) + */ + float getAlpha(); + + /** + * Sets the rotation angle of this image. + * @param rotation The rotation in degrees + */ + void setRotation(float rotation); + + /** + * @return The rotation angle of this image in degrees + */ + float getRotation(); + + /** + * Sets the image type which determines where the image is rendered. + * @param imageType The image type: 0 = Default, 1 = Text, 2 = Option + */ + void setImageType(int imageType); + + /** + * @return The image type: 0 = Default, 1 = Text, 2 = Option + */ + int getImageType(); + + /** + * Sets the alignment of this image. + * @param alignment The alignment value + */ + void setAlignment(int alignment); + + /** + * @return The alignment value of this image + */ + int getAlignment(); +} diff --git a/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicCycle.java b/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicCycle.java new file mode 100644 index 000000000..3f88337cc --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicCycle.java @@ -0,0 +1,78 @@ +package noppes.npcs.api.handler.data; + +/** + * Represents a cycle (or category) grouping for magics. + * A magic cycle holds ordering and display information as well as associations + * to multiple magics. + */ +public interface IMagicCycle { + + /** + * Gets the unique identifier of this magic cycle. + * + * @return the cycle ID + */ + int getId(); + + /** + * Gets the internal name of the magic cycle. + * + * @return the name of the cycle + */ + String getName(); + + /** + * Sets the internal name of the magic cycle. + * + * @param name the new name of the cycle + */ + void setName(String name); + + /** + * Gets the display name of the magic cycle. + * + * @return the display name for the cycle + */ + String getDisplayName(); + + /** + * Sets the display name of the magic cycle. + * + * @param displayName the new display name of the cycle + */ + void setDisplayName(String displayName); + + /** + * Gets the layout type for the cycle. + * This is typically an integer representation of the layout enum. + *

+ * 0: CIRCULAR + * 1: SQUARE + * 2: TREE + * 3: GENERATED + * 4: CIRCULAR_MANUAL + * 5: SQUARE_MANUAL + * 6: TREE_MANUAL + * 7: CHART + * + * @return the layout type as an integer + */ + int getLayoutType(); + + /** + * Sets the layout type for the cycle. + * The provided integer should correspond to a valid layout type. + *

+ * 0: CIRCULAR + * 1: SQUARE + * 2: TREE + * 3: GENERATED + * 4: CIRCULAR_MANUAL + * 5: SQUARE_MANUAL + * 6: TREE_MANUAL + * 7: CHART + * + * @param layout the layout type as an integer + */ + void setLayoutType(int layout); +} diff --git a/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicData.java b/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicData.java new file mode 100644 index 000000000..de3e0806f --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/api/handler/data/IMagicData.java @@ -0,0 +1,44 @@ +package noppes.npcs.api.handler.data; + +public interface IMagicData { + + /** + * @param id The ID of the Magic + */ + void removeMagic(int id); + + /** + * @param id The ID of the Magic + * @return If the Magic exists + */ + boolean hasMagic(int id); + + /** + * Clears the Magics + */ + void clear(); + + /** + * @return If the Magics are empty + */ + boolean isEmpty(); + + /** + * @param id The ID of the Magic + * @param damage The bonus damage for the Magic + * @param split The split of the Magic + */ + void addMagic(int id, float damage, float split); + + /** + * @param id The ID of the Magic + * @return The bonus damage for the Magic + */ + float getMagicDamage(int id); + + /** + * @param id The ID of the Magic + * @return The split of the Magic + */ + float getMagicSplit(int id); +} diff --git a/platform-api/src/main/java/noppes/npcs/api/handler/data/IProfileOptions.java b/platform-api/src/main/java/noppes/npcs/api/handler/data/IProfileOptions.java new file mode 100644 index 000000000..92d776658 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/api/handler/data/IProfileOptions.java @@ -0,0 +1,28 @@ +package noppes.npcs.api.handler.data; + +public interface IProfileOptions { + + boolean hasProfileOptions(); + + void setProfileOptions(boolean enable); + + /** + * @param profileType 0:Individual, 1:Shared + */ + void setCooldownControl(int profileType); + + /** + * @return 0:Individual, 1:Shared + */ + int getCooldownControl(); + + /** + * @param profileType 0:Individual, 1:Shared + */ + void setCompleteControl(int profileType); + + /** + * @return 0:Individual, 1:Shared + */ + int getCompleteControl(); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/PlatformService.java b/platform-api/src/main/java/noppes/npcs/platform/PlatformService.java new file mode 100644 index 000000000..29786decf --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/PlatformService.java @@ -0,0 +1,96 @@ +package noppes.npcs.platform; + +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.platform.nbt.NBTFactory; + +import java.io.File; +import java.io.IOException; + +/** + * Central platform abstraction that bridges CORE logic with MC-version-specific code. + * + * Each mc* module (mc1710, mc1122, mc1165, mc1201) provides an implementation + * that is registered during mod initialization via {@link PlatformServiceHolder#set(PlatformService)}. + * + * CORE code accesses this via {@link PlatformServiceHolder#get()}. + */ +public interface PlatformService { + + // --- NBT --- + + /** + * @return the NBT factory for creating and wrapping NBT objects + */ + NBTFactory nbt(); + + // --- NBT I/O --- + + /** + * Reads a compressed NBT compound from a file. + * Maps to CompressedStreamTools.readCompressed() in MC. + */ + INBTCompound readCompressedNBT(File file) throws IOException; + + /** + * Writes a compressed NBT compound to a file. + * Maps to CompressedStreamTools.writeCompressed() in MC. + */ + void writeCompressedNBT(INBTCompound compound, File file) throws IOException; + + // --- Paths --- + + /** + * @return the world save directory (server-side), e.g. "saves/MyWorld/customnpcs/" + */ + File getWorldSaveDirectory(); + + /** + * @return a subdirectory within the world save directory + */ + File getWorldSaveDirectory(String subdir); + + /** + * @return the global config directory, e.g. ".minecraft/config/" + */ + File getConfigDirectory(); + + // --- Environment --- + + /** + * @return true if running on the physical client (has a GUI) + */ + boolean isPhysicalClient(); + + /** + * @return the mod version string + */ + String getModVersion(); + + // --- Logging --- + + /** + * Logs at INFO level. + */ + void logInfo(String message); + + /** + * Logs at WARN level. + */ + void logWarn(String message); + + /** + * Logs at ERROR level. + */ + void logError(String message); + + /** + * Logs at ERROR level with a throwable. + */ + void logError(String message, Throwable t); + + /** + * Logs at DEBUG level. + */ + void logDebug(String message); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/PlatformServiceHolder.java b/platform-api/src/main/java/noppes/npcs/platform/PlatformServiceHolder.java new file mode 100644 index 000000000..c1a5a5c8c --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/PlatformServiceHolder.java @@ -0,0 +1,51 @@ +package noppes.npcs.platform; + +/** + * Static accessor for the active {@link PlatformService} implementation. + * + * The mc* module sets this once during mod initialization: + *

+ *     PlatformServiceHolder.set(new MC1710PlatformService());
+ * 
+ * + * CORE code retrieves it via: + *
+ *     PlatformService platform = PlatformServiceHolder.get();
+ * 
+ */ +public final class PlatformServiceHolder { + + private static PlatformService instance; + + private PlatformServiceHolder() {} + + /** + * Sets the active platform service. Must be called exactly once during mod initialization. + * + * @throws IllegalStateException if already set + */ + public static void set(PlatformService service) { + if (instance != null) { + throw new IllegalStateException("PlatformService has already been initialized"); + } + instance = service; + } + + /** + * @return the active platform service + * @throws IllegalStateException if not yet initialized + */ + public static PlatformService get() { + if (instance == null) { + throw new IllegalStateException("PlatformService has not been initialized yet"); + } + return instance; + } + + /** + * @return true if the platform service has been initialized + */ + public static boolean isInitialized() { + return instance != null; + } +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/config/IConfigProvider.java b/platform-api/src/main/java/noppes/npcs/platform/config/IConfigProvider.java new file mode 100644 index 000000000..305b987b8 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/config/IConfigProvider.java @@ -0,0 +1,39 @@ +package noppes.npcs.platform.config; + +/** + * Version-independent abstraction over Minecraft Forge's Configuration system. + * + * Maps to: + * - 1.7.10 / 1.12: net.minecraftforge.common.config.Configuration + * - 1.16+: net.minecraftforge.common.ForgeConfigSpec (different pattern) + * + * CORE config classes use this to load/save values without + * depending on Forge APIs. + */ +public interface IConfigProvider { + + boolean getBoolean(String category, String key, boolean defaultValue, String comment); + + int getInt(String category, String key, int defaultValue, String comment); + + int getInt(String category, String key, int defaultValue, int min, int max, String comment); + + double getDouble(String category, String key, double defaultValue, String comment); + + String getString(String category, String key, String defaultValue, String comment); + + /** + * Gets a string value from a set of valid values. + */ + String getString(String category, String key, String defaultValue, String comment, String[] validValues); + + /** + * Checks if the config has been changed since last save. + */ + boolean hasChanged(); + + /** + * Saves the config file to disk. + */ + void save(); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTCompound.java b/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTCompound.java new file mode 100644 index 000000000..a78d39915 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTCompound.java @@ -0,0 +1,125 @@ +package noppes.npcs.platform.nbt; + +/** + * Version-independent abstraction over Minecraft's NBT compound tag. + * + * Maps to: + * - 1.7.10 / 1.12: net.minecraft.nbt.NBTTagCompound + * - 1.16+: net.minecraft.nbt.CompoundNBT / CompoundTag + * + * Each mc* module provides a thin wrapper implementation that delegates + * to the real MC class. CORE code uses this interface exclusively. + */ +public interface INBTCompound { + + // --- Setters --- + + void setString(String key, String value); + + void setInteger(String key, int value); + + void setBoolean(String key, boolean value); + + void setDouble(String key, double value); + + void setFloat(String key, float value); + + void setLong(String key, long value); + + void setShort(String key, short value); + + void setByte(String key, byte value); + + void setByteArray(String key, byte[] value); + + void setIntArray(String key, int[] value); + + void setCompound(String key, INBTCompound compound); + + void setTag(String key, INBTCompound compound); + + void setList(String key, INBTList list); + + // --- Getters --- + + String getString(String key); + + int getInteger(String key); + + boolean getBoolean(String key); + + double getDouble(String key); + + float getFloat(String key); + + long getLong(String key); + + short getShort(String key); + + byte getByte(String key); + + byte[] getByteArray(String key); + + int[] getIntArray(String key); + + INBTCompound getCompound(String key); + + /** + * Gets a tag list from this compound. + * @param key the key + * @param type the element type ID (e.g. 10 for compounds, 8 for strings) + * @return the list, or an empty list if the key doesn't exist + */ + INBTList getList(String key, int type); + + // --- Query --- + + boolean hasKey(String key); + + /** + * Checks if this compound has a key of a specific NBT type. + * @param key the key + * @param type the NBT type ID + */ + boolean hasKey(String key, int type); + + /** + * @return a set of all keys in this compound + */ + java.util.Set getKeySet(); + + /** + * Removes a key from this compound. + */ + void removeTag(String key); + + /** + * Returns the NBT type ID for the tag with the given key. + * @return the type ID (see {@link noppes.npcs.constants.NBTTypes}), or 0 if not present + */ + int getTagType(String key); + + /** + * @return true if this compound has no keys + */ + boolean isEmpty(); + + // --- Interop --- + + /** + * Merges all tags from the given compound into this one. + */ + void merge(INBTCompound other); + + /** + * Creates a deep copy of this compound. + */ + INBTCompound copy(); + + /** + * Returns the underlying MC NBT object. + * Used at the boundary between CORE and version-specific code. + * CORE code should NEVER call this — only mc* modules should. + */ + Object getUnderlyingTag(); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTList.java b/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTList.java new file mode 100644 index 000000000..a727b8cfc --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/nbt/INBTList.java @@ -0,0 +1,88 @@ +package noppes.npcs.platform.nbt; + +/** + * Version-independent abstraction over Minecraft's NBT list tag. + * + * Maps to: + * - 1.7.10 / 1.12: net.minecraft.nbt.NBTTagList + * - 1.16+: net.minecraft.nbt.ListNBT / ListTag + */ +public interface INBTList { + + /** + * @return the number of elements in this list + */ + int size(); + + /** + * Gets the compound tag at the given index. + * @throws ClassCastException if the element is not a compound + */ + INBTCompound getCompound(int index); + + /** + * Gets the string value at the given index. + */ + String getString(int index); + + /** + * Gets the integer value at the given index (from int array tags). + */ + int getInt(int index); + + /** + * Gets the double value at the given index. + */ + double getDouble(int index); + + /** + * Gets the float value at the given index. + */ + float getFloat(int index); + + /** + * Gets an int array at the given index (for lists of int arrays). + */ + int[] getIntArray(int index); + + /** + * @return the NBT type ID of elements in this list (see {@link noppes.npcs.constants.NBTTypes}), + * or 0 if the list is empty + */ + int getElementType(); + + // --- Mutators --- + + /** + * Appends a compound tag to the end of this list. + */ + void addCompound(INBTCompound compound); + + /** + * Appends a string to the end of this list. + */ + void addString(String value); + + /** + * Appends an integer tag to the end of this list. + */ + void addInt(int value); + + /** + * Appends a double tag to the end of this list. + */ + void addDouble(double value); + + /** + * Removes and returns the element at the given index. + */ + void remove(int index); + + // --- Interop --- + + /** + * Returns the underlying MC NBT list object. + * CORE code should NEVER call this — only mc* modules should. + */ + Object getUnderlyingTag(); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTFactory.java b/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTFactory.java new file mode 100644 index 000000000..77fb82429 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTFactory.java @@ -0,0 +1,37 @@ +package noppes.npcs.platform.nbt; + +/** + * Factory for creating new NBT instances. + * Each mc* module provides an implementation via PlatformService. + */ +public interface NBTFactory { + + /** + * Creates a new, empty compound tag. + */ + INBTCompound createCompound(); + + /** + * Creates a new, empty list tag. + */ + INBTList createList(); + + /** + * Wraps a raw MC NBT compound object into an INBTCompound. + * Used at the boundary when receiving NBT from MC code. + * + * @param mcNBTTagCompound the raw MC NBTTagCompound / CompoundTag + * @return the wrapped interface + * @throws IllegalArgumentException if the object is not a valid MC NBT compound + */ + INBTCompound wrap(Object mcNBTTagCompound); + + /** + * Wraps a raw MC NBT list object into an INBTList. + * + * @param mcNBTTagList the raw MC NBTTagList / ListTag + * @return the wrapped interface + * @throws IllegalArgumentException if the object is not a valid MC NBT list + */ + INBTList wrapList(Object mcNBTTagList); +} diff --git a/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTIO.java b/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTIO.java new file mode 100644 index 000000000..83c528072 --- /dev/null +++ b/platform-api/src/main/java/noppes/npcs/platform/nbt/NBTIO.java @@ -0,0 +1,37 @@ +package noppes.npcs.platform.nbt; + +import java.io.File; +import java.io.IOException; + +/** + * Abstraction for NBT file I/O operations. + * + * Maps to CompressedStreamTools in MC. Used by controllers for + * reading/writing world save data. + */ +public interface NBTIO { + + /** + * Reads a compressed NBT compound from a file. + * Equivalent to CompressedStreamTools.readCompressed(FileInputStream). + */ + INBTCompound readCompressed(File file) throws IOException; + + /** + * Writes a compressed NBT compound to a file. + * Equivalent to CompressedStreamTools.writeCompressed(NBTTagCompound, FileOutputStream). + */ + void writeCompressed(INBTCompound compound, File file) throws IOException; + + /** + * Reads an uncompressed NBT compound from a file. + * Equivalent to CompressedStreamTools.read(File). + */ + INBTCompound read(File file) throws IOException; + + /** + * Writes an uncompressed NBT compound to a file (safe write with temp file). + * Equivalent to CompressedStreamTools.safeWrite(NBTTagCompound, File). + */ + void safeWrite(INBTCompound compound, File file) throws IOException; +} diff --git a/settings.gradle b/settings.gradle index e58786789..2e44d97ab 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,4 +29,9 @@ plugins { } // Include the local gradle-plugins composite build so plugin is resolved locally -includeBuild 'gradle-plugins' \ No newline at end of file +includeBuild 'gradle-plugins' + +// CNPC+ Multi-Version Core Modules +// These are plain Java libraries with no Minecraft dependencies. +// They contain version-independent game logic shared across all MC versions. +include 'core', 'platform-api' \ No newline at end of file diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 57b111404..8da2068b5 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -45,6 +45,7 @@ import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; import java.util.EnumMap; @@ -336,7 +337,7 @@ public class SyncController { NBTTagCompound compound = new NBTTagCompound(); for (MagicCycle cycle : MagicController.getInstance().cycles.values()) { NBTTagCompound cycleCompound = new NBTTagCompound(); - cycle.writeNBT(cycleCompound); + cycle.writeNBT(new MC1710NBTCompound(cycleCompound)); list.appendTag(cycleCompound); } compound.setTag("Data", list); @@ -585,7 +586,7 @@ public class SyncController { mc.cyclesSync.clear(); for (int i = 0; i < list.tagCount(); i++) { MagicCycle cycle = new MagicCycle(); - cycle.readNBT(list.getCompoundTagAt(i)); + cycle.readNBT(new MC1710NBTCompound(list.getCompoundTagAt(i))); mc.cyclesSync.put(cycle.id, cycle); } @@ -757,7 +758,7 @@ public class SyncController { } case MAGIC_CYCLE: { MagicCycle cycle = new MagicCycle(); - cycle.readNBT(compound); + cycle.readNBT(new MC1710NBTCompound(compound)); MagicController.getInstance().cycles.put(cycle.id, cycle); break; } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 05049d8bb..0ce17a290 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -57,6 +57,7 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.controllers.data.MagicEntry; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.client.gui.advanced.SubGuiAbilityMagic; @@ -1533,7 +1534,7 @@ public abstract class Ability implements IAbility, IAbilityAction { nbt.setFloat("telegraphHeightOffset", telegraphHeightOffset); nbt.setTag("customData", (NBTTagCompound) customData.copy()); TagController.writeTagUUIDs(nbt, "TagUUIDs", tagUUIDs); - magicData.writeToNBT(nbt); + magicData.writeToNBT(new MC1710NBTCompound(nbt)); nbt.setInteger("allowedBy", allowedBy.ordinal()); nbt.setBoolean("ignoreCooldown", ignoreCooldown); nbt.setBoolean("perAbilityCooldown", perAbilityCooldown); @@ -1633,7 +1634,7 @@ public abstract class Ability implements IAbility, IAbilityAction { telegraphHeightOffset = nbt.getFloat("telegraphHeightOffset"); customData = (NBTTagCompound) nbt.getCompoundTag("customData").copy(); tagUUIDs = TagController.readTagUUIDs(nbt, "TagUUIDs"); - magicData.readToNBT(nbt); + magicData.readToNBT(new MC1710NBTCompound(nbt)); allowedBy = UserType.fromOrdinal(nbt.getInteger("allowedBy")); ignoreCooldown = nbt.getBoolean("ignoreCooldown"); perAbilityCooldown = nbt.getBoolean("perAbilityCooldown"); diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java index 9d6e8ab88..a6320e35c 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java @@ -13,6 +13,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; /** * Universal base class for all energy ability entities (Projectiles, Barriers, Sweeper). @@ -358,7 +359,7 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit if (customDamageData != null) { nbt.setTag("CustomDamageData", customDamageData); } - magicData.writeToNBT(nbt); + magicData.writeToNBT(new MC1710NBTCompound(nbt)); } /** @@ -373,7 +374,7 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit if (nbt.hasKey("CustomDamageData")) { this.customDamageData = nbt.getCompoundTag("CustomDamageData"); } - magicData.readToNBT(nbt); + magicData.readToNBT(new MC1710NBTCompound(nbt)); } // ==================== WORLD NBT (INTENTIONALLY EMPTY) ==================== diff --git a/src/main/java/kamkeel/npcs/network/packets/data/PlayerDataInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/PlayerDataInfoPacket.java index 8a89f8086..b4f9f183e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/PlayerDataInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/PlayerDataInfoPacket.java @@ -11,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; import java.util.Map; @@ -86,7 +87,7 @@ public final class PlayerDataInfoPacket extends LargeAbstractPacket { writeMap(buffer, factionData); NBTTagCompound compound = new NBTTagCompound(); - playerMagicData.writeToNBT(compound); + playerMagicData.writeToNBT(new MC1710NBTCompound(compound)); ByteBufUtils.writeNBT(buffer, compound); byte[] bytes = new byte[buffer.readableBytes()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java index 687a00a1f..6a75fa4a3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java @@ -14,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.AbilityHotbarData; import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -61,7 +62,7 @@ public final class AbilityHotbarSavePacket extends AbstractPacket { AbilityHotbarData slotData = data.hotbarData.getSlot(slot); if (slotData == null) return; - slotData.readFromNBT(compound.getCompoundTag("AbilityHotbar" + slot)); + slotData.readFromNBT(new MC1710NBTCompound(compound.getCompoundTag("AbilityHotbar" + slot))); // Validate the ability key boolean valid = true; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java index bbb6a9f62..9b639a7ad 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; import java.util.HashMap; @@ -71,7 +72,7 @@ public class MagicCyclesPacket extends AbstractPacket { return; NBTTagCompound compound = new NBTTagCompound(); NBTTagCompound magicCompound = new NBTTagCompound(); - cycle.writeNBT(magicCompound); + cycle.writeNBT(new MC1710NBTCompound(magicCompound)); compound.setTag("MagicCycle", magicCompound); GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/category/CategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/category/CategorySavePacket.java index 15eafa3fd..f6950f5f2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/category/CategorySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/category/CategorySavePacket.java @@ -22,6 +22,7 @@ import noppes.npcs.controllers.CategoryManager; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.LinkedItemController; import noppes.npcs.controllers.data.Category; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -72,7 +73,7 @@ public final class CategorySavePacket extends AbstractPacket { return; Category cat = new Category(); - cat.readNBT(compound); + cat.readNBT(new MC1710NBTCompound(compound)); if (cat.id <= 0) { cm.createCategory(cat.title); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderCrudPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderCrudPacket.java index 061700e35..fbd89f61a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderCrudPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderCrudPacket.java @@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.CloneFolder; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -102,7 +103,7 @@ public final class CloneFolderCrudPacket extends AbstractPacket { compound.setBoolean("Success", success); NBTTagList folderList = new NBTTagList(); for (CloneFolder folder : ServerCloneController.Instance.getFolderList()) { - folderList.appendTag(folder.writeNBT(new NBTTagCompound())); + folderList.appendTag(((MC1710NBTCompound) folder.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag()); } compound.setTag("CloneFolders", folderList); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderListPacket.java index b7e7fe9f8..b56c0a4c0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneFolderListPacket.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.CloneFolder; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -50,7 +51,7 @@ public final class CloneFolderListPacket extends AbstractPacket { NBTTagCompound compound = new NBTTagCompound(); NBTTagList folderList = new NBTTagList(); for (CloneFolder folder : ServerCloneController.Instance.getFolderList()) { - folderList.appendTag(folder.writeNBT(new NBTTagCompound())); + folderList.appendTag(((MC1710NBTCompound) folder.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag()); } compound.setTag("CloneFolders", folderList); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java index 158896eaf..e56580cf3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.ServerTagMapController; import noppes.npcs.controllers.data.TagMap; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -73,7 +74,7 @@ public final class CloneTagListPacket extends AbstractPacket { tagMap = ServerTagMapController.Instance.getTagMap(tab); } NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("CloneTags", tagMap.writeNBT()); + compound.setTag("CloneTags", ((MC1710NBTCompound) tagMap.writeNBT()).getMCTag()); GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleSavePacket.java index e37f82646..7e891c899 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleSavePacket.java @@ -15,6 +15,7 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -58,7 +59,7 @@ public class MagicCycleSavePacket extends AbstractPacket { return; NBTTagCompound comp = ByteBufUtils.readNBT(in); MagicCycle cycle = new MagicCycle(); - cycle.readNBT(comp); + cycle.readNBT(new MC1710NBTCompound(comp)); MagicController.getInstance().saveCycle(cycle); NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java index 3498f32aa..1efa7a9b3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -72,7 +73,7 @@ public final class MagicGetPacket extends AbstractPacket { MagicCycle cycle = MagicController.getInstance().getCycle(id); NBTTagCompound compound = new NBTTagCompound(); NBTTagCompound magicCompound = new NBTTagCompound(); - cycle.writeNBT(magicCompound); + cycle.writeNBT(new MC1710NBTCompound(magicCompound)); compound.setTag("MagicCycle", magicCompound); GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java index d3c5ef841..5a12e298c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java @@ -13,6 +13,7 @@ import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -48,7 +49,7 @@ public final class MagicNpcGetPacket extends AbstractPacket { return; NBTTagCompound compound = new NBTTagCompound(); - npc.stats.magicData.writeToNBT(compound); + npc.stats.magicData.writeToNBT(new MC1710NBTCompound(compound)); GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java index 7e5b0c765..9583ea09e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.IOException; @@ -54,7 +55,7 @@ public final class MagicNpcSavePacket extends AbstractPacket { public void sendData(ByteBuf out) throws IOException { NBTTagCompound compound = new NBTTagCompound(); if (magicData != null) { - magicData.writeToNBT(compound); + magicData.writeToNBT(new MC1710NBTCompound(compound)); } ByteBufUtils.writeNBT(out, compound); } @@ -65,6 +66,6 @@ public final class MagicNpcSavePacket extends AbstractPacket { return; NBTTagCompound compound = ByteBufUtils.readNBT(in); - npc.stats.magicData.readToNBT(compound); + npc.stats.magicData.readToNBT(new MC1710NBTCompound(compound)); } } diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 810354152..23bc6333c 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -64,6 +64,8 @@ import nikedemos.markovnames.generators.MarkovSlavic; import nikedemos.markovnames.generators.MarkovSpanish; import nikedemos.markovnames.generators.MarkovWelsh; import noppes.npcs.compat.PixelmonHelper; +import noppes.npcs.platform.PlatformServiceHolder; +import noppes.npcs.wrapper.MC1710PlatformService; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.legacy.LegacyConfig; @@ -214,6 +216,11 @@ public class CustomNpcs { @EventHandler public void load(FMLPreInitializationEvent ev) { + // Initialize the platform service bridge for CORE module + if (!PlatformServiceHolder.isInitialized()) { + PlatformServiceHolder.set(new MC1710PlatformService()); + } + PacketHandler.Instance = new PacketHandler(); MinecraftServer server = MinecraftServer.getServer(); diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index c17649754..74c89dd5e 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -21,6 +21,7 @@ import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.HitboxData; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.controllers.data.TintData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; @@ -102,7 +103,7 @@ public class DataDisplay { nbttagcompound = animationData.writeToNBT(nbttagcompound); nbttagcompound = hitboxData.writeToNBT(nbttagcompound); - nbttagcompound = tintData.writeToNBT(nbttagcompound); + nbttagcompound = ((MC1710NBTCompound) tintData.writeToNBT(new MC1710NBTCompound(nbttagcompound))).getMCTag(); if (this.playerProfile != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); @@ -190,7 +191,7 @@ public class DataDisplay { animationData.readFromNBT(nbttagcompound); hitboxData.readFromNBT(nbttagcompound); - tintData.readFromNBT(nbttagcompound); + tintData.readFromNBT(new MC1710NBTCompound(nbttagcompound)); modelSize = ValueUtil.clamp(nbttagcompound.getInteger("Size"), 1, Integer.MAX_VALUE); if (modelSize > ConfigMain.NpcSizeLimit) diff --git a/src/main/java/noppes/npcs/DataStats.java b/src/main/java/noppes/npcs/DataStats.java index 7db32bc66..9c61e0383 100644 --- a/src/main/java/noppes/npcs/DataStats.java +++ b/src/main/java/noppes/npcs/DataStats.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptParticle; import noppes.npcs.util.ValueUtil; @@ -139,7 +140,7 @@ public class DataStats { compound.setBoolean("PlayerSetCanDespawn", playerSetCanDespawn); compound.setInteger("CollidesWith", collidesWith); - magicData.writeToNBT(compound); + magicData.writeToNBT(new MC1710NBTCompound(compound)); return compound; } @@ -215,7 +216,7 @@ public class DataStats { attackInvisible = compound.getBoolean("AttackInvisible"); canDespawn = compound.getBoolean("CanDespawn"); playerSetCanDespawn = compound.getBoolean("PlayerSetCanDespawn"); - magicData.readToNBT(compound); + magicData.readToNBT(new MC1710NBTCompound(compound)); npc.setImmuneToFire(immuneToFire); diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 53dbfb239..803d35287 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -75,6 +75,7 @@ import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.controllers.data.PlayerBankData; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerDialogData; @@ -1256,7 +1257,7 @@ public class NoppesUtilServer { playerdata = PlayerData.get(pl); if (enumPlayerData == EnumPlayerData.Magic) { // Quest removal - playerdata.magicData.readToNBT(compound); + playerdata.magicData.readToNBT(new MC1710NBTCompound(compound)); } playerdata.save(); diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 620142564..b27299111 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -28,6 +28,7 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; @@ -260,7 +261,7 @@ public class NoppesUtil { Map bankData = readMap(data); Map factionData = readMap(data); MagicData magicData = new MagicData(); - magicData.readToNBT(ByteBufUtils.readNBT(data)); + magicData.readToNBT(new MC1710NBTCompound(ByteBufUtils.readNBT(data))); GuiScreen gui = Minecraft.getMinecraft().currentScreen; if (gui == null) diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 7fd5c174e..51a583e3f 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -32,6 +32,7 @@ import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.controllers.data.TagMap; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -596,7 +597,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData, ICust } else if (compound.hasKey("CloneTags")) { this.tagMap = new TagMap(activeTab); NBTTagCompound cloneTags = compound.getCompoundTag("CloneTags"); - this.tagMap.readNBT(cloneTags); + this.tagMap.readNBT(new MC1710NBTCompound(cloneTags)); } else if (compound.hasKey("AllTags")) { NBTTagList validTags = compound.getTagList("AllTags", 10); if (validTags != null) { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 5cea7fe28..e16fb3742 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -25,6 +25,7 @@ import noppes.npcs.client.gui.util.ISubGuiListener; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.CloneFolder; import noppes.npcs.controllers.data.Tag; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -302,7 +303,7 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall serverFolderNames.clear(); for (int i = 0; i < folderList.tagCount(); i++) { CloneFolder f = new CloneFolder(); - f.readNBT(folderList.getCompoundTagAt(i)); + f.readNBT(new MC1710NBTCompound(folderList.getCompoundTagAt(i))); serverFolderNames.add(f.name); } validateFolder(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerFullscreen.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerFullscreen.java index eabc33fee..cab9e2d3d 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerFullscreen.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerFullscreen.java @@ -34,6 +34,7 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.CloneFolder; import noppes.npcs.controllers.data.Tag; import noppes.npcs.controllers.data.TagMap; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -992,7 +993,7 @@ public class GuiNpcMobSpawnerFullscreen extends GuiDirectory implements IGuiData folderNames.clear(); for (int i = 0; i < folderList.tagCount(); i++) { CloneFolder folder = new CloneFolder(); - folder.readNBT(folderList.getCompoundTagAt(i)); + folder.readNBT(new MC1710NBTCompound(folderList.getCompoundTagAt(i))); folderNames.add(folder.name); } initGui(); @@ -1005,7 +1006,7 @@ public class GuiNpcMobSpawnerFullscreen extends GuiDirectory implements IGuiData this.tagMap = new TagMap(GuiNpcMobSpawner.activeTab); } NBTTagCompound cloneTags = compound.getCompoundTag("CloneTags"); - this.tagMap.readNBT(cloneTags); + this.tagMap.readNBT(new MC1710NBTCompound(cloneTags)); } else if (compound.hasKey("AllTags")) { NBTTagList validTags = compound.getTagList("AllTags", 10); if (validTags != null) { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java index b9c6ea4ca..2e44b80e0 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java @@ -16,6 +16,7 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumDiagramLayout; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.util.ArrayList; import java.util.HashMap; @@ -311,7 +312,7 @@ public class SubGuiMagicCycle extends SubGuiInterface implements ITextfieldListe cycle.associations.put(associationMap.get(name).magicId, associationMap.get(name)); } NBTTagCompound compound = new NBTTagCompound(); - cycle.writeNBT(compound); + cycle.writeNBT(new MC1710NBTCompound(compound)); PacketClient.sendClient(new MagicCycleSavePacket(compound)); super.close(); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java index c3d85c8ad..020766aaf 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java @@ -22,6 +22,7 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import org.lwjgl.opengl.GL11; import java.util.ArrayList; @@ -1033,7 +1034,7 @@ public class SubGuiPlayerData extends SubGuiInterface implements IPlayerDataInfo private void saveMagicCompound() { NBTTagCompound magicCompound = new NBTTagCompound(); - magicData.writeToNBT(magicCompound); + magicData.writeToNBT(new MC1710NBTCompound(magicCompound)); PacketClient.sendClient(new PlayerDataSaveInfoPacket(playerName, EnumPlayerData.Magic, magicCompound)); } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java index c235d75f5..85eeb1bf1 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java @@ -17,6 +17,7 @@ import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -174,7 +175,7 @@ public class GuiNPCMagic extends GuiNPCInterface2 implements IScrollData, ICusto @Override public void setGuiData(NBTTagCompound compound) { - npcMagicData.readToNBT(compound); + npcMagicData.readToNBT(new MC1710NBTCompound(compound)); initGui(); } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java index 0684218c2..5c3c75877 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java @@ -36,6 +36,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.client.ClientEventHandler; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.advanced.SubGuiAbilityTypeSelect; @@ -235,7 +236,7 @@ public class GuiAbilityDirectory extends GuiDirectoryCategorized @Override protected void onSaveCategory(Category cat) { - PacketClient.sendClient(new CategorySavePacket(getCategoryType(), cat.writeNBT(new NBTTagCompound()))); + PacketClient.sendClient(new CategorySavePacket(getCategoryType(), ((MC1710NBTCompound) cat.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag())); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiAnimationDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiAnimationDirectory.java index 15f3ec9ff..bac5cbdb1 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiAnimationDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiAnimationDirectory.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiDirectoryCategorized; @@ -135,7 +136,7 @@ public class GuiAnimationDirectory extends GuiDirectoryCategorized { @Override protected void onSaveCategory(Category cat) { - PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.ANIMATION, cat.writeNBT(new NBTTagCompound()))); + PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.ANIMATION, ((MC1710NBTCompound) cat.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag())); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java index 4133082d0..7056651dc 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java @@ -14,6 +14,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.gui.SubGuiEffectGeneral; @@ -58,7 +59,7 @@ public class GuiEffectDirectory extends GuiDirectoryCategorized { @Override protected void onSaveCategory(Category cat) { - PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.EFFECT, cat.writeNBT(new NBTTagCompound()))); + PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.EFFECT, ((MC1710NBTCompound) cat.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag())); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java index 20f92a51f..4e27c11ab 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java @@ -16,6 +16,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.ClientCacheHandler; import net.minecraft.client.gui.GuiButton; @@ -59,7 +60,7 @@ public class GuiLinkedItemDirectory extends GuiDirectoryCategorized { @Override protected void onSaveCategory(Category cat) { - PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.LINKED_ITEM, cat.writeNBT(new NBTTagCompound()))); + PacketClient.sendClient(new CategorySavePacket(EnumCategoryType.LINKED_ITEM, ((MC1710NBTCompound) cat.writeNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag())); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java index 76036717e..bcfbbf72d 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java @@ -26,6 +26,7 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -397,7 +398,7 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen magicCycle.name = "New"; magicCycle.displayName = "New"; NBTTagCompound compound = new NBTTagCompound(); - magicCycle.writeNBT(compound); + magicCycle.writeNBT(new MC1710NBTCompound(compound)); PacketClient.sendClient(new MagicCycleSavePacket(compound)); } break; @@ -547,7 +548,7 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen selectedMagic.readNBT(compound.getCompoundTag("Magic")); } else if (compound.hasKey("MagicCycle")) { selectedCycle = new MagicCycle(); - selectedCycle.readNBT(compound.getCompoundTag("MagicCycle")); + selectedCycle.readNBT(new MC1710NBTCompound(compound.getCompoundTag("MagicCycle"))); // Refresh the magic list based on the new cycle. updateMagicList(); selectedMagic = null; diff --git a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java index 3348f059f..cc09ee409 100644 --- a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java +++ b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java @@ -13,6 +13,7 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.util.ArrayList; import java.util.HashMap; @@ -169,7 +170,7 @@ public class GuiNpcMagicBook extends GuiNPCInterface implements ICustomScrollLis public void setGuiData(NBTTagCompound compound) { if (compound.hasKey("MagicCycle")) { magicCycle = new MagicCycle(); - magicCycle.readNBT(compound.getCompoundTag("MagicCycle")); + magicCycle.readNBT(new MC1710NBTCompound(compound.getCompoundTag("MagicCycle"))); initGui(); } } diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java index 40febf172..b4b9a8e34 100644 --- a/src/main/java/noppes/npcs/controllers/MagicController.java +++ b/src/main/java/noppes/npcs/controllers/MagicController.java @@ -14,6 +14,7 @@ import noppes.npcs.constants.EnumDiagramLayout; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -213,7 +214,7 @@ public class MagicController implements IMagicHandler { for (int i = 0; i < cycleList.tagCount(); i++) { NBTTagCompound catCompound = cycleList.getCompoundTagAt(i); MagicCycle cycle = new MagicCycle(); - cycle.readNBT(catCompound); + cycle.readNBT(new MC1710NBTCompound(catCompound)); cycles.put(cycle.id, cycle); } } @@ -228,7 +229,7 @@ public class MagicController implements IMagicHandler { NBTTagList catList = new NBTTagList(); for (MagicCycle cat : cycles.values()) { NBTTagCompound catCompound = new NBTTagCompound(); - cat.writeNBT(catCompound); + cat.writeNBT(new MC1710NBTCompound(catCompound)); catList.appendTag(catCompound); } NBTTagCompound compound = new NBTTagCompound(); @@ -344,7 +345,7 @@ public class MagicController implements IMagicHandler { cycles.put(cycle.id, cycle); NBTTagCompound cycleCompound = new NBTTagCompound(); - cycle.writeNBT(cycleCompound); + cycle.writeNBT(new MC1710NBTCompound(cycleCompound)); SyncController.syncUpdate(EnumSyncType.MAGIC_CYCLE, -1, cycleCompound); saveMagicData(); diff --git a/src/main/java/noppes/npcs/controllers/MarketRegistry.java b/src/main/java/noppes/npcs/controllers/MarketRegistry.java index 55de3a0bf..2a1e8bac6 100644 --- a/src/main/java/noppes/npcs/controllers/MarketRegistry.java +++ b/src/main/java/noppes/npcs/controllers/MarketRegistry.java @@ -4,6 +4,7 @@ import foxz.utils.Market; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.roles.RoleTrader; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.util.Collections; import java.util.Map; @@ -139,7 +140,7 @@ public class MarketRegistry { for (RoleTrader trader : traders) { // Update stock data from cache if (stockData != null && stockData.hasKey("EnableStock")) { - trader.stock.readFromNBT(stockData); + trader.stock.readFromNBT(new MC1710NBTCompound(stockData)); } } } diff --git a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java index 42ca6afeb..c04a60d1a 100644 --- a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java +++ b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java @@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.controllers.data.TagMap; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -69,7 +70,7 @@ public class ServerTagMapController { public void loadTagMaps(DataInputStream stream) throws IOException { NBTTagCompound nbtCompound = CompressedStreamTools.read(stream); - this.tagMap.readNBT(nbtCompound); + this.tagMap.readNBT(new MC1710NBTCompound(nbtCompound)); } public TagMap getTagMap(String folderName) { @@ -102,7 +103,7 @@ public class ServerTagMapController { File file = new File(saveDir, "___tagmap.dat_new"); File file1 = new File(saveDir, "___tagmap.dat_old"); File file2 = new File(saveDir, "___tagmap.dat"); - CompressedStreamTools.writeCompressed(tagMap.writeNBT(), new FileOutputStream(file)); + CompressedStreamTools.writeCompressed(((MC1710NBTCompound) tagMap.writeNBT()).getMCTag(), new FileOutputStream(file)); if (file1.exists()) { file1.delete(); } diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index e68fe717e..a0f6d315b 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -13,6 +13,7 @@ import noppes.npcs.api.handler.data.IDialogOption; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.QuestController; import noppes.npcs.scripted.CustomNPCsException; @@ -125,7 +126,7 @@ public class Dialog implements ICompatibilty, IDialog { NBTTagCompound imageCompound = images.getCompoundTagAt(i); int id = imageCompound.getInteger("ID"); DialogImage image = new DialogImage(id); - image.readNBT(imageCompound); + image.readNBT(new MC1710NBTCompound(imageCompound)); newImages.put(id, image); } this.dialogImages = newImages; @@ -173,7 +174,7 @@ public class Dialog implements ICompatibilty, IDialog { availability.readFromNBT(compound); factionOptions.readFromNBT(compound); - colorData.readFromNBT(compound); + colorData.readFromNBT(new MC1710NBTCompound(compound)); } @@ -209,7 +210,7 @@ public class Dialog implements ICompatibilty, IDialog { availability.writeToNBT(compound); factionOptions.writeToNBT(compound); - colorData.writeToNBT(compound); + colorData.writeToNBT(new MC1710NBTCompound(compound)); compound.setInteger("ModRev", version); compound.setInteger("Color", color); @@ -236,7 +237,7 @@ public class Dialog implements ICompatibilty, IDialog { NBTTagList images = new NBTTagList(); for (IDialogImage dialogImage : dialogImages.values()) { - NBTTagCompound imageCompound = ((DialogImage) dialogImage).writeToNBT(new NBTTagCompound()); + NBTTagCompound imageCompound = ((MC1710NBTCompound) ((DialogImage) dialogImage).writeToNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag(); images.appendTag(imageCompound); } compound.setTag("Images", images); diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItem.java b/src/main/java/noppes/npcs/controllers/data/LinkedItem.java index 14081a85a..f8c647f5e 100644 --- a/src/main/java/noppes/npcs/controllers/data/LinkedItem.java +++ b/src/main/java/noppes/npcs/controllers/data/LinkedItem.java @@ -10,6 +10,7 @@ import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.LinkedItemController; import noppes.npcs.controllers.TagController; import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.scripted.item.ScriptLinkedItem; import java.util.HashSet; @@ -57,7 +58,7 @@ public class LinkedItem implements ILinkedItem { compound.setInteger("Version", this.version); compound.setString("Name", this.name); - compound.setTag("Display", this.display.writeToNBT()); + compound.setTag("Display", ((MC1710NBTCompound) this.display.writeToNBT()).getMCTag()); compound.setDouble("DurabilityValue", this.durabilityValue); compound.setInteger("MaxStackSize", this.stackSize); @@ -90,7 +91,7 @@ public class LinkedItem implements ILinkedItem { this.name = compound.getString("Name"); this.version = compound.getInteger("Version"); - this.display.readFromNBT(compound.getCompoundTag("Display")); + this.display.readFromNBT(new MC1710NBTCompound(compound.getCompoundTag("Display"))); this.durabilityValue = compound.getDouble("DurabilityValue"); this.stackSize = compound.getInteger("MaxStackSize"); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java index 6ff49c4b6..77c8095df 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java @@ -7,6 +7,7 @@ import kamkeel.npcs.network.packets.data.ability.AbilityHotbarSyncPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; public class PlayerAbilityHotbarData { public AbilityHotbarData[] slots = new AbilityHotbarData[AbilityHotbarData.TOTAL_SLOTS]; @@ -41,14 +42,14 @@ public class PlayerAbilityHotbarData { public void writeToNBT(NBTTagCompound compound) { for (int i = 0; i < slots.length; i++) { - slots[i].writeToNBT(compound); + slots[i].writeToNBT(new MC1710NBTCompound(compound)); } } public void readFromNBT(NBTTagCompound compound) { for (int i = 0; i < slots.length; i++) { NBTTagCompound slotTag = compound.getCompoundTag("AbilityHotbar" + i); - slots[i].readFromNBT(slotTag); + slots[i].readFromNBT(new MC1710NBTCompound(slotTag)); } validateSlots(); } diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index 0c575eb77..f4e376f2f 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -27,6 +27,7 @@ import noppes.npcs.api.handler.IPlayerQuestData; import noppes.npcs.api.handler.IPlayerTradeData; import noppes.npcs.api.handler.IPlayerTransportData; import noppes.npcs.config.ConfigMain; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; @@ -151,7 +152,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData { skinOverlays.readFromNBT(data); animationData.readFromNBT(data); effectData.readFromNBT(data); - magicData.readToNBT(data); + magicData.readToNBT(new MC1710NBTCompound(data)); tradeData.readFromNBT(data); abilityData.readFromNBT(data); hotbarData.readFromNBT(data); @@ -196,7 +197,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData { skinOverlays.writeToNBT(compound); animationData.writeToNBT(compound); effectData.writeToNBT(compound); - magicData.writeToNBT(compound); + magicData.writeToNBT(new MC1710NBTCompound(compound)); tradeData.writeToNBT(compound); abilityData.writeToNBT(compound); hotbarData.writeToNBT(compound); diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index c7e63ec1f..41bb624b8 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -22,6 +22,7 @@ import noppes.npcs.api.handler.data.IQuestInterface; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.constants.EnumProfileSync; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; @@ -93,7 +94,7 @@ public class Quest implements ICompatibilty, IQuest { factionOptions.readFromNBT(compound.getCompoundTag("QuestFactionPoints")); partyOptions.readFromNBT(compound.getCompoundTag("PartyOptions")); - profileOptions.readFromNBT(compound.getCompoundTag("ProfileOptions")); + profileOptions.readFromNBT(new MC1710NBTCompound(compound.getCompoundTag("ProfileOptions"))); mail.readNBT(compound.getCompoundTag("QuestMail")); } @@ -141,7 +142,7 @@ public class Quest implements ICompatibilty, IQuest { this.questInterface.writeEntityToNBT(compound); compound.setTag("QuestFactionPoints", factionOptions.writeToNBT(new NBTTagCompound())); compound.setTag("PartyOptions", partyOptions.writeToNBT()); - compound.setTag("ProfileOptions", profileOptions.writeToNBT()); + compound.setTag("ProfileOptions", ((MC1710NBTCompound) profileOptions.writeToNBT()).getMCTag()); compound.setTag("QuestMail", mail.writeNBT()); return compound; diff --git a/src/main/java/noppes/npcs/roles/RoleTrader.java b/src/main/java/noppes/npcs/roles/RoleTrader.java index 6aa69d357..1c4bed14f 100644 --- a/src/main/java/noppes/npcs/roles/RoleTrader.java +++ b/src/main/java/noppes/npcs/roles/RoleTrader.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; @@ -78,7 +79,7 @@ public class RoleTrader extends RoleInterface { } // Stock system - nbttagcompound.setTag("Stock", stock.writeToNBT(new NBTTagCompound())); + nbttagcompound.setTag("Stock", ((MC1710NBTCompound) stock.writeToNBT(new MC1710NBTCompound(new NBTTagCompound()))).getMCTag()); // Currency cost per slot (additive to item costs) NBTTagList currencyList = new NBTTagList(); @@ -131,7 +132,7 @@ public class RoleTrader extends RoleInterface { // Stock system if (nbttagcompound.hasKey("Stock")) { - stock.readFromNBT(nbttagcompound.getCompoundTag("Stock")); + stock.readFromNBT(new MC1710NBTCompound(nbttagcompound.getCompoundTag("Stock"))); } // Currency cost per slot (additive to item costs) diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomizableItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomizableItem.java index a029b4ba4..b2148c17c 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomizableItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomizableItem.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.controllers.data.ItemDisplayData; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; public abstract class ScriptCustomizableItem extends ScriptItemStack implements IItemCustomizable { public final ItemDisplayData itemDisplay = new ItemDisplayData(); @@ -201,12 +202,12 @@ public abstract class ScriptCustomizableItem extends ScriptItemStack implements } public NBTTagCompound getItemNBT(NBTTagCompound compound) { - this.itemDisplay.writeToNBT(compound); + this.itemDisplay.writeToNBT(new MC1710NBTCompound(compound)); return compound; } public void setItemNBT(NBTTagCompound compound) { - this.itemDisplay.readFromNBT(compound); + this.itemDisplay.readFromNBT(new MC1710NBTCompound(compound)); } } diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java index f86d5c113..2383448f1 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java @@ -6,6 +6,7 @@ import noppes.npcs.api.item.IItemLinked; import noppes.npcs.controllers.LinkedItemController; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.controllers.data.LinkedItem; +import noppes.npcs.wrapper.nbt.MC1710NBTCompound; public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLinked { public LinkedItem linkedItem = new LinkedItem(); @@ -219,7 +220,7 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin } public NBTTagCompound getItemNBT(NBTTagCompound compound) { - this.itemDisplay.writeToNBT(compound); + this.itemDisplay.writeToNBT(new MC1710NBTCompound(compound)); compound.setTag(LinkedItem.LINKED_DATA_NBT_TAG, this.linkedItem.writeToNBT(false)); compound.setInteger(LinkedItem.LINKED_VERSION_VERSION_TAG, this.linkedVersion); compound.setDouble("DurabilityValue", this.durabilityValue); @@ -227,7 +228,7 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin } public void setItemNBT(NBTTagCompound compound) { - this.itemDisplay.readFromNBT(compound); + this.itemDisplay.readFromNBT(new MC1710NBTCompound(compound)); this.linkedItem.readFromNBT(compound.getCompoundTag(LinkedItem.LINKED_DATA_NBT_TAG)); this.linkedVersion = compound.getInteger(LinkedItem.LINKED_VERSION_VERSION_TAG); if (compound.hasKey("DurabilityValue")) diff --git a/src/main/java/noppes/npcs/wrapper/MC1710PlatformService.java b/src/main/java/noppes/npcs/wrapper/MC1710PlatformService.java new file mode 100644 index 000000000..a11ede11e --- /dev/null +++ b/src/main/java/noppes/npcs/wrapper/MC1710PlatformService.java @@ -0,0 +1,94 @@ +package noppes.npcs.wrapper; + +import noppes.npcs.CustomNpcs; +import noppes.npcs.platform.PlatformService; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.platform.nbt.NBTFactory; +import noppes.npcs.wrapper.nbt.MC1710NBTFactory; +import noppes.npcs.wrapper.nbt.MC1710NBTIO; + +import java.io.File; +import java.io.IOException; + +/** + * 1.7.10 implementation of PlatformService. + * Bridges CORE code to MC 1.7.10 APIs. + */ +public class MC1710PlatformService implements PlatformService { + + private final MC1710NBTFactory nbtFactory = new MC1710NBTFactory(); + private final MC1710NBTIO nbtIO = new MC1710NBTIO(); + + @Override + public NBTFactory nbt() { + return nbtFactory; + } + + @Override + public INBTCompound readCompressedNBT(File file) throws IOException { + return nbtIO.readCompressed(file); + } + + @Override + public void writeCompressedNBT(INBTCompound compound, File file) throws IOException { + nbtIO.writeCompressed(compound, file); + } + + @Override + public File getWorldSaveDirectory() { + return CustomNpcs.getWorldSaveDirectory(); + } + + @Override + public File getWorldSaveDirectory(String subdir) { + return CustomNpcs.getWorldSaveDirectory(subdir); + } + + @Override + public File getConfigDirectory() { + return new File(CustomNpcs.configPath); + } + + @Override + public boolean isPhysicalClient() { + try { + // If Minecraft class is loadable, we're on the client + Class.forName("net.minecraft.client.Minecraft"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + + @Override + public String getModVersion() { + return "1.11"; + } + + @Override + public void logInfo(String message) { + System.out.println("[CustomNPC+] " + message); + } + + @Override + public void logWarn(String message) { + System.out.println("[CustomNPC+ WARN] " + message); + } + + @Override + public void logError(String message) { + System.err.println("[CustomNPC+ ERROR] " + message); + } + + @Override + public void logError(String message, Throwable t) { + System.err.println("[CustomNPC+ ERROR] " + message); + t.printStackTrace(); + } + + @Override + public void logDebug(String message) { + System.out.println("[CustomNPC+ DEBUG] " + message); + } +} diff --git a/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTCompound.java b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTCompound.java new file mode 100644 index 000000000..a8602a2a8 --- /dev/null +++ b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTCompound.java @@ -0,0 +1,225 @@ +package noppes.npcs.wrapper.nbt; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; + +import java.util.Set; + +/** + * 1.7.10 implementation of INBTCompound. + * Thin wrapper that delegates to NBTTagCompound. + */ +public class MC1710NBTCompound implements INBTCompound { + + private final NBTTagCompound tag; + + public MC1710NBTCompound(NBTTagCompound tag) { + this.tag = tag; + } + + /** + * Direct access to the underlying MC tag. + * For use within 1.7.10 code only — avoids the cast from getUnderlyingTag(). + */ + public NBTTagCompound getMCTag() { + return tag; + } + + // --- Setters --- + + @Override + public void setString(String key, String value) { + tag.setString(key, value); + } + + @Override + public void setInteger(String key, int value) { + tag.setInteger(key, value); + } + + @Override + public void setBoolean(String key, boolean value) { + tag.setBoolean(key, value); + } + + @Override + public void setDouble(String key, double value) { + tag.setDouble(key, value); + } + + @Override + public void setFloat(String key, float value) { + tag.setFloat(key, value); + } + + @Override + public void setLong(String key, long value) { + tag.setLong(key, value); + } + + @Override + public void setShort(String key, short value) { + tag.setShort(key, value); + } + + @Override + public void setByte(String key, byte value) { + tag.setByte(key, value); + } + + @Override + public void setByteArray(String key, byte[] value) { + tag.setByteArray(key, value); + } + + @Override + public void setIntArray(String key, int[] value) { + tag.setIntArray(key, value); + } + + @Override + public void setCompound(String key, INBTCompound compound) { + tag.setTag(key, ((MC1710NBTCompound) compound).getMCTag()); + } + + @Override + public void setTag(String key, INBTCompound compound) { + setCompound(key, compound); + } + + @Override + public void setList(String key, INBTList list) { + tag.setTag(key, (NBTTagList) list.getUnderlyingTag()); + } + + // --- Getters --- + + @Override + public String getString(String key) { + return tag.getString(key); + } + + @Override + public int getInteger(String key) { + return tag.getInteger(key); + } + + @Override + public boolean getBoolean(String key) { + return tag.getBoolean(key); + } + + @Override + public double getDouble(String key) { + return tag.getDouble(key); + } + + @Override + public float getFloat(String key) { + return tag.getFloat(key); + } + + @Override + public long getLong(String key) { + return tag.getLong(key); + } + + @Override + public short getShort(String key) { + return tag.getShort(key); + } + + @Override + public byte getByte(String key) { + return tag.getByte(key); + } + + @Override + public byte[] getByteArray(String key) { + return tag.getByteArray(key); + } + + @Override + public int[] getIntArray(String key) { + return tag.getIntArray(key); + } + + @Override + public INBTCompound getCompound(String key) { + return new MC1710NBTCompound(tag.getCompoundTag(key)); + } + + @Override + public INBTList getList(String key, int type) { + return new MC1710NBTList(tag.getTagList(key, type)); + } + + // --- Query --- + + @Override + public boolean hasKey(String key) { + return tag.hasKey(key); + } + + @Override + public boolean hasKey(String key, int type) { + return tag.hasKey(key, type); + } + + @Override + @SuppressWarnings("unchecked") + public Set getKeySet() { + return (Set) tag.func_150296_c(); + } + + @Override + public int getTagType(String key) { + return tag.func_150299_b(key); + } + + @Override + public void removeTag(String key) { + tag.removeTag(key); + } + + @Override + public boolean isEmpty() { + return tag.hasNoTags(); + } + + // --- Interop --- + + @Override + public void merge(INBTCompound other) { + NBTTagCompound otherTag = ((MC1710NBTCompound) other).getMCTag(); + for (Object keyObj : otherTag.func_150296_c()) { + String key = (String) keyObj; + tag.setTag(key, otherTag.getTag(key).copy()); + } + } + + @Override + public INBTCompound copy() { + return new MC1710NBTCompound((NBTTagCompound) tag.copy()); + } + + @Override + public Object getUnderlyingTag() { + return tag; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof MC1710NBTCompound) { + return tag.equals(((MC1710NBTCompound) obj).tag); + } + return false; + } + + @Override + public int hashCode() { + return tag.hashCode(); + } +} diff --git a/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTFactory.java b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTFactory.java new file mode 100644 index 000000000..be3b6dff9 --- /dev/null +++ b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTFactory.java @@ -0,0 +1,43 @@ +package noppes.npcs.wrapper.nbt; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; +import noppes.npcs.platform.nbt.NBTFactory; + +/** + * 1.7.10 implementation of NBTFactory. + */ +public class MC1710NBTFactory implements NBTFactory { + + @Override + public INBTCompound createCompound() { + return new MC1710NBTCompound(new NBTTagCompound()); + } + + @Override + public INBTList createList() { + return new MC1710NBTList(new NBTTagList()); + } + + @Override + public INBTCompound wrap(Object mcNBTTagCompound) { + if (!(mcNBTTagCompound instanceof NBTTagCompound)) { + throw new IllegalArgumentException( + "Expected NBTTagCompound, got " + mcNBTTagCompound.getClass().getName() + ); + } + return new MC1710NBTCompound((NBTTagCompound) mcNBTTagCompound); + } + + @Override + public INBTList wrapList(Object mcNBTTagList) { + if (!(mcNBTTagList instanceof NBTTagList)) { + throw new IllegalArgumentException( + "Expected NBTTagList, got " + mcNBTTagList.getClass().getName() + ); + } + return new MC1710NBTList((NBTTagList) mcNBTTagList); + } +} diff --git a/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTIO.java b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTIO.java new file mode 100644 index 000000000..275bb3927 --- /dev/null +++ b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTIO.java @@ -0,0 +1,64 @@ +package noppes.npcs.wrapper.nbt; + +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.NBTIO; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * 1.7.10 implementation of NBTIO. + * Delegates to CompressedStreamTools. + */ +public class MC1710NBTIO implements NBTIO { + + @Override + public INBTCompound readCompressed(File file) throws IOException { + FileInputStream fis = new FileInputStream(file); + try { + NBTTagCompound tag = CompressedStreamTools.readCompressed(fis); + return new MC1710NBTCompound(tag); + } finally { + fis.close(); + } + } + + @Override + public void writeCompressed(INBTCompound compound, File file) throws IOException { + NBTTagCompound tag = ((MC1710NBTCompound) compound).getMCTag(); + FileOutputStream fos = new FileOutputStream(file); + try { + CompressedStreamTools.writeCompressed(tag, fos); + } finally { + fos.close(); + } + } + + @Override + public INBTCompound read(File file) throws IOException { + NBTTagCompound tag = CompressedStreamTools.read(file); + return new MC1710NBTCompound(tag); + } + + @Override + public void safeWrite(INBTCompound compound, File file) throws IOException { + NBTTagCompound tag = ((MC1710NBTCompound) compound).getMCTag(); + // 1.7.10 doesn't have safeWrite, implement with temp file + File tempFile = new File(file.getAbsolutePath() + ".tmp"); + FileOutputStream fos = new FileOutputStream(tempFile); + try { + CompressedStreamTools.writeCompressed(tag, fos); + } finally { + fos.close(); + } + // Atomic rename + if (file.exists()) { + file.delete(); + } + tempFile.renameTo(file); + } +} diff --git a/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTList.java b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTList.java new file mode 100644 index 000000000..6f6dbb07e --- /dev/null +++ b/src/main/java/noppes/npcs/wrapper/nbt/MC1710NBTList.java @@ -0,0 +1,110 @@ +package noppes.npcs.wrapper.nbt; + +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; +import noppes.npcs.platform.nbt.INBTCompound; +import noppes.npcs.platform.nbt.INBTList; + +/** + * 1.7.10 implementation of INBTList. + * Thin wrapper that delegates to NBTTagList. + */ +public class MC1710NBTList implements INBTList { + + private final NBTTagList tag; + + public MC1710NBTList(NBTTagList tag) { + this.tag = tag; + } + + /** + * Direct access to the underlying MC tag. + * For use within 1.7.10 code only. + */ + public NBTTagList getMCTag() { + return tag; + } + + // --- Getters --- + + @Override + public int size() { + return tag.tagCount(); + } + + @Override + public INBTCompound getCompound(int index) { + return new MC1710NBTCompound(tag.getCompoundTagAt(index)); + } + + @Override + public String getString(int index) { + return tag.getStringTagAt(index); + } + + @Override + public int getInt(int index) { + // 1.7.10 doesn't have a direct getIntAt on NBTTagList. + // Parse from the string representation or use the compound approach. + // In practice, int lists are stored as compounds with "Slot" keys. + // For direct int tag lists, use getStringTagAt and parse. + return Integer.parseInt(tag.getStringTagAt(index)); + } + + @Override + public double getDouble(int index) { + return tag.func_150309_d(index); + } + + @Override + public float getFloat(int index) { + return tag.func_150308_e(index); + } + + @Override + public int[] getIntArray(int index) { + return tag.func_150306_c(index); + } + + @Override + public int getElementType() { + return tag.func_150303_d(); + } + + // --- Mutators --- + + @Override + public void addCompound(INBTCompound compound) { + tag.appendTag(((MC1710NBTCompound) compound).getMCTag()); + } + + @Override + public void addString(String value) { + tag.appendTag(new NBTTagString(value)); + } + + @Override + public void addInt(int value) { + tag.appendTag(new NBTTagInt(value)); + } + + @Override + public void addDouble(double value) { + tag.appendTag(new NBTTagDouble(value)); + } + + @Override + public void remove(int index) { + tag.removeTag(index); + } + + // --- Interop --- + + @Override + public Object getUnderlyingTag() { + return tag; + } +}