From 909cc503c5ff48dd1aa9f2ba22a6a4607a2a3e85 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Mon, 11 Nov 2024 04:13:52 -0600 Subject: [PATCH 1/5] add issue templates --- .github/ISSUE_TEMPLATE/000-report-bug.yml | 62 +++++++++++++++++++ .../ISSUE_TEMPLATE/001-request-feature.yml | 28 +++++++++ 2 files changed, 90 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/000-report-bug.yml create mode 100644 .github/ISSUE_TEMPLATE/001-request-feature.yml diff --git a/.github/ISSUE_TEMPLATE/000-report-bug.yml b/.github/ISSUE_TEMPLATE/000-report-bug.yml new file mode 100644 index 0000000000..f2b27106d7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/000-report-bug.yml @@ -0,0 +1,62 @@ +name: Report Bug +description: "Report a bug." +body: + - type: markdown + attributes: + value: "A bug/crash report with sufficient information and logs to reproduce and track down." + - type: input + id: discord + attributes: + label: Your GTNH Discord Username + description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info. + placeholder: "Example: Fake#1234" + - type: input + id: version + attributes: + label: Mod Version + description: "What version of the Mod are you using?" + placeholder: "Example: 1.0.0" + validations: + required: true + - type: textarea + id: report + attributes: + label: Bug Report + description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log." + placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox." + validations: + required: true + - type: dropdown + id: java + attributes: + label: Java Version + description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version. + options: + - Java 8 + - Java 9 + - Java 11 + - Java 17 + - Java 19 + - Java 20 + - Java 21 + - Other (Please Specify) + validations: + required: true + - type: textarea + id: modlist + attributes: + label: Mod List or GTNH Pack Version + description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log). If using GTNH please indicate pack version and any changed mods, not the entire modlist." + placeholder: "List of mods or GTNH Pack version goes here" + validations: + required: true + - type: checkboxes + id: final + attributes: + label: Final Checklist + description: Certify that you read things + options: + - label: "I have searched the issues and haven't found a similar issue." + required: true + + diff --git a/.github/ISSUE_TEMPLATE/001-request-feature.yml b/.github/ISSUE_TEMPLATE/001-request-feature.yml new file mode 100644 index 0000000000..cb325a124e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/001-request-feature.yml @@ -0,0 +1,28 @@ +name: Feature Request +description: "Request a feature." +body: + - type: markdown + attributes: + value: "Please use this form to request features. We ask you check if it was already requested though" + - type: input + id: discord + attributes: + label: Your GTNH Discord Username + description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info. + placeholder: "Example: Wumpus#1234" + - type: textarea + id: request + attributes: + label: Feature Request + description: "Relevant information, as well as relevant images" + placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox." + validations: + required: true + - type: checkboxes + id: final + attributes: + label: Final Checklist + description: Certify that you read things + options: + - label: "I have searched the issues and haven't found a similar issue." + required: true From 13d538468780a295add6c15f28487b7469bb73d8 Mon Sep 17 00:00:00 2001 From: Shadow1590 <60554355+Shadow1590@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:02:23 +0100 Subject: [PATCH 2/5] Fix reach ring (#64) Co-authored-by: Shadow1590 <> --- .../common/item/equipment/bauble/ItemBauble.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 2ad0612aca..56ced61791 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -39,6 +39,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { private static final String TAG_HASHCODE = "playerHashcode"; + private static final String TAG_HASHCODE_CLIENT = "playerHashcodeClient"; private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost"; private static final String TAG_BAUBLE_UUID_LEAST = "baubleUUIDLeast"; private static final String TAG_COSMETIC_ITEM = "cosmeticItem"; @@ -122,9 +123,9 @@ public boolean canUnequip(ItemStack stack, EntityLivingBase player) { @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { - if(getLastPlayerHashcode(stack) != player.hashCode()) { + if(getLastPlayerHashcode(stack, player.worldObj.isRemote) != player.hashCode()) { onEquippedOrLoadedIntoWorld(stack, player); - setLastPlayerHashcode(stack, player.hashCode()); + setLastPlayerHashcode(stack, player.hashCode(), player.worldObj.isRemote); } } @@ -138,7 +139,7 @@ public void onEquipped(ItemStack stack, EntityLivingBase player) { ((EntityPlayer) player).addStat(ModAchievements.baubleWear, 1); onEquippedOrLoadedIntoWorld(stack, player); - setLastPlayerHashcode(stack, player.hashCode()); + setLastPlayerHashcode(stack, player.hashCode(), player.worldObj.isRemote); } } @@ -195,12 +196,12 @@ public static UUID getBaubleUUID(ItemStack stack) { return new UUID(most, least); } - public static int getLastPlayerHashcode(ItemStack stack) { - return ItemNBTHelper.getInt(stack, TAG_HASHCODE, 0); + public static int getLastPlayerHashcode(ItemStack stack, boolean remote) { + return ItemNBTHelper.getInt(stack, remote ? TAG_HASHCODE_CLIENT : TAG_HASHCODE, 0); } - public static void setLastPlayerHashcode(ItemStack stack, int hash) { - ItemNBTHelper.setInt(stack, TAG_HASHCODE, hash); + public static void setLastPlayerHashcode(ItemStack stack, int hash, boolean remote) { + ItemNBTHelper.setInt(stack, remote ? TAG_HASHCODE_CLIENT : TAG_HASHCODE, hash); } @Override From 512aa4eddb0e90ffeb0096522ad54f4ce0813c13 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Dec 2024 18:32:14 +0100 Subject: [PATCH 3/5] update --- dependencies.gradle | 10 +++++----- settings.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1dbf80603c..cd4f41b8a9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,15 +5,15 @@ dependencies { compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.15.11:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.9-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:Railcraft:9.15.15:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.5-GTNH:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.26-GTNH:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.50-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') {transitive=false} - compile('com.github.GTNewHorizons:GTNHLib:0.4.3:dev') + compile('com.github.GTNewHorizons:GTNHLib:0.5.21:dev') compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.26-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.50-GTNH:dev') } diff --git a/settings.gradle b/settings.gradle index 242692e5d7..aa612ade0c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' } From 7f838cd24cdf13ae94474817a2f5b739fbe5883d Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Tue, 10 Dec 2024 11:57:33 +0000 Subject: [PATCH 4/5] Fix music disk use in the GT electric jukebox by adding metadata (#66) --- dependencies.gradle | 6 +++--- gradle.properties | 6 +++--- .../botania/common/item/record/ItemModRecord.java | 10 +++++++++- src/main/java/vazkii/botania/common/lib/LibMisc.java | 5 +++-- src/main/resources/soundmeta/durations.json | 6 ++++++ 5 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/soundmeta/durations.json diff --git a/dependencies.gradle b/dependencies.gradle index cd4f41b8a9..5778a2c59d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,16 +1,16 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:Baubles:1.0.4:dev') + api('com.github.GTNewHorizons:Baubles:1.0.4:dev') - compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.github.GTNewHorizons:Railcraft:9.15.15:api') {transitive=false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.5-GTNH:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.50-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') {transitive=false} - compile('com.github.GTNewHorizons:GTNHLib:0.5.21:dev') + api('com.github.GTNewHorizons:GTNHLib:0.5.22:dev') compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') diff --git a/gradle.properties b/gradle.properties index 3a8b4c89fd..bc83dbe9a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,10 +50,10 @@ enableGenericInjection = false # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = vazkii.botania.common.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -70,7 +70,7 @@ gradleTokenGroupName = # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = LibMisc.java +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 793dd4d7ea..75bb242af5 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -21,8 +21,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import com.gtnewhorizon.gtnhlib.api.MusicRecordMetadataProvider; -public class ItemModRecord extends ItemRecord { +public class ItemModRecord extends ItemRecord implements MusicRecordMetadataProvider { private final String file; @@ -55,4 +56,11 @@ public ResourceLocation getRecordResource(String name) { return new ResourceLocation(file); } + @Override + public ResourceLocation getMusicRecordResource(ItemStack stack) { + if (stack == null || !(stack.getItem() instanceof ItemModRecord)) { + return null; + } + return new ResourceLocation(file); + } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 2bbc98d156..6d7b80fe66 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -11,14 +11,15 @@ package vazkii.botania.common.lib; import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.common.Tags; public final class LibMisc { // Mod Constants public static final String MOD_ID = "Botania"; public static final String MOD_NAME = MOD_ID; - public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft"; + public static final String VERSION = Tags.VERSION; + public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft;required-after:gtnhlib@[0.5.22,)"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/resources/soundmeta/durations.json b/src/main/resources/soundmeta/durations.json new file mode 100644 index 0000000000..52d3d15ec2 --- /dev/null +++ b/src/main/resources/soundmeta/durations.json @@ -0,0 +1,6 @@ +{ + "soundDurationsMs": { + "botania:music.gaia1": 202498, + "botania:music.gaia2": 226995 + } +} From 903619e38c5928fc4ea05ee5ce41c07e33443bce Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 10 Dec 2024 20:34:40 +0100 Subject: [PATCH 5/5] update --- dependencies.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 5778a2c59d..be2ddb79a0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,12 +8,12 @@ dependencies { compileOnly('com.github.GTNewHorizons:Railcraft:9.15.15:api') {transitive=false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.5-GTNH:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.50-GTNH:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') {transitive=false} api('com.github.GTNewHorizons:GTNHLib:0.5.22:dev') compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.50-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 3990 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e54..e2847c8200 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index aa612ade0c..0147a99449 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' }