Merge branch '1.20.1/dev' into 1.20.1/ponders

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
#	common/src/main/java/dev/ithundxr/createnumismatics/Numismatics.java
#	gradle.properties

.github/workflows/build.yml

@@ -20,9 +20,10 @@ jobs:
           restore-keys: "${{ runner.os }}-gradle-"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
+          cache-read-only: ${{ !endsWith(github.ref_name, '/dev') }}
 
       - name: Validate Gradle Wrapper Integrity
         uses: gradle/wrapper-validation-action@v2

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
           restore-keys: "${{ runner.os }}-gradle-"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
           cache-read-only: true
@@ -40,6 +40,7 @@ jobs:
       - name: Build & Publish
         env:
           RELEASE_BUILD: true
+          PLATFORM: ${{ inputs.platform }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
           MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

build.gradle.kts

@@ -92,8 +92,8 @@ subprojects {
         maven("https://maven.shedaniel.me/") // Cloth Config, REI
         maven("https://maven.blamejared.com/") // JEI, Carry On
         maven("https://maven.parchmentmc.org") // Parchment mappings
-        maven("https://maven.ithundxr.dev/releases") // Steam 'n' Rails Releases
-        maven("https://maven.ithundxr.dev/snapshots") // Steam 'n' Rails Snapshots
+        maven("https://mvn.devos.one/snapshots/") // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric, Steam 'n' Rails
+        maven("https://mvn.devos.one/releases") // Porting Lib Releases, Steam 'n' Rails Releases
         maven("https://maven.tterrag.com/") { // Flywheel
             content {
                 // need to be specific here due to version overlaps
@@ -124,9 +124,9 @@ subprojects {
             val maven = if (isRelease) "releases" else "snapshots"
             if (mavenToken != null && mavenToken.isNotEmpty()) {
                 maven {
-                    url = uri("https://maven.ithundxr.dev/${maven}")
+                    url = uri("https://mvn.devos.one/${maven}")
                     credentials {
-                        username = "numismatics-github"
+                        username = "ithundxr-github"
                         password = mavenToken
                     }
                 }

changelog.md

@@ -25,7 +25,17 @@ Changes
   Backwards compatible with existing vendors, so the items will remain 'real' until you remove them.
   Additionally, enchantments and dyes can be applied to some items by shift-dragging items when using EMI on fabric or JEI on forge
 - OP'ed players no longer automatically have access to all Numismatics blocks. Instead, they can use the command `/numismatics toggle_admin_mode` to toggle that ability
-- Update to Create 0.5.1-h
+- Update to Create 0.5.1-j
+------------------------------------------------------
+Numismatics 1.0.8
+------------------------------------------------------
+Fixes
+- Update to Create Fabric 0.5.1-j
+------------------------------------------------------
+Numismatics 1.0.7
+------------------------------------------------------
+Fixes
+- Double items being given when clicking a vendor with the offhand
 ------------------------------------------------------
 Numismatics 1.0.6
 ------------------------------------------------------

common/build.gradle.kts

@@ -34,8 +34,6 @@ repositories {
     // mavens for Create Fabric and dependencies
     maven("https://api.modrinth.com/maven") // LazyDFU
     maven("https://maven.terraformersmc.com/releases/") // Mod Menu
-    maven("https://mvn.devos.one/snapshots/") // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric
-    maven("https://mvn.devos.one/releases") // Porting Lib Releases
     maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") // Forge config api port
     maven("https://maven.cafeteria.dev/releases") // Fake Player API
     maven("https://maven.jamieswhiteshirt.com/libs-release") // Reach Entity Attributes

common/src/main/java/dev/ithundxr/createnumismatics/Numismatics.java

@@ -39,7 +39,6 @@
 import dev.ithundxr.createnumismatics.registry.NumismaticsCreativeModeTabs.Tabs;
 import dev.ithundxr.createnumismatics.registry.NumismaticsPackets;
 import dev.ithundxr.createnumismatics.util.MethodVarHandleUtils;
-import dev.ithundxr.createnumismatics.util.NumismaticsUpdateCheck;
 import dev.ithundxr.createnumismatics.util.Utils;
 import net.minecraft.SharedConstants;
 import net.minecraft.Util;
@@ -68,7 +67,6 @@ public class Numismatics {
     public static void init() {
         String createVersion = MethodVarHandleUtils.getStaticField(Create.class, "VERSION", String.class, "UNKNOWN");
         LOGGER.info("{} v{} initializing! Commit hash: {} Create version: {} on platform: {}", NAME, NumismaticsBuildInfo.VERSION, NumismaticsBuildInfo.GIT_COMMIT, createVersion, Loader.getFormatted());
-        NumismaticsUpdateCheck.execute();
 
         ModSetup.register();
         finalizeRegistrate();

common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java

@@ -90,4 +90,20 @@ public static void onPlayerJoin(ServerPlayer player) {
             }
         }
     }
+
+    @MultiLoaderEvent
+    public static InteractionResult onUseBlock(Player player, Level level, InteractionHand hand, BlockHitResult hitResult) {
+        BlockPos pos = hitResult.getBlockPos();
+        BlockState state = level.getBlockState(pos);
+
+        boolean offhandFix = !level.isClientSide()
+            && !player.getOffhandItem().isEmpty()
+            && !(player.getOffhandItem().getItem() instanceof BlockItem) &&
+            hand.equals(InteractionHand.MAIN_HAND);
+        if ((offhandFix || player.isShiftKeyDown()) && state.getBlock() instanceof VendorBlock vb) {
+            return vb.use(state, level, pos, player, hand, hitResult);
+        }
+
+        return InteractionResult.PASS;
+    }
 }

common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java

@@ -32,6 +32,11 @@
 public class NumismaticsBlockEntities {
     private static final CreateRegistrate REGISTRATE = Numismatics.registrate();
 
+/*    public static final BlockEntityEntry<SemaphoreBlockEntity> SEMAPHORE = REGISTRATE.blockEntity("semaphore", SemaphoreBlockEntity::new)
+        .validBlocks(CRBlocks.SEMAPHORE)
+        .renderer(() -> SemaphoreRenderer::new)
+        .register();*/
+
     public static final BlockEntityEntry<AndesiteDepositorBlockEntity> ANDESITE_DEPOSITOR = REGISTRATE.blockEntity("andesite_depositor", AndesiteDepositorBlockEntity::new)
         .validBlocks(NumismaticsBlocks.ANDESITE_DEPOSITOR)
         .register();

common/src/main/resources/assets/numismatics/lang/ru_ru.json

@@ -24,6 +24,13 @@
   "block.numismatics.creative_vendor": "Творческий торговый автомат",
   "block.numismatics.creative_vendor.tooltip": "ТВОРЧЕСКИЙ ТОРГОВЫЙ АВТОМАТ",
   "block.numismatics.creative_vendor.tooltip.summary": "_Творческая_ версия торгового автомата, после настройки никогда не переполнится, а товар не закончится.",
+  "block.numismatics.salepoint": "Точка розлива",
+  "block.numismatics.salepoint.tooltip.clear": "Выбор интерфейса сброшен",
+  "block.numismatics.salepoint.tooltip.missing": "Сначала ПКМ выберите целевой интерфейс",
+  "block.numismatics.salepoint.tooltip.not_found": "Целевой интерфейс не найден",
+  "block.numismatics.salepoint.tooltip.set": "Интерфейс выбран",
+  "block.numismatics.salepoint.tooltip.success": "Успешно привязана к интерфейсу",
+  "block.numismatics.salepoint.tooltip.too_far": "Целевой интерфейс слишком далеко",
   "block.numismatics.trusted_block.attempt_break": "Зажмите Shift, чтобы разрушить блок",
   "block.numismatics.vendor": "Торговый автомат",
   "block.numismatics.vendor.tooltip": "ТОРГОВЫЙ АВТОМАТ",
@@ -56,6 +63,22 @@
   "gui.numismatics.limit": "Потрачено %s из %s",
   "gui.numismatics.limit.monetary": "Потрачено %s %s, %s¤ из %s %s, %s¤",
   "gui.numismatics.limit.none": "Нет лимита",
+  "gui.numismatics.salepoint.cancel": "Отменить транзакцию",
+  "gui.numismatics.salepoint.count": "Единиц",
+  "gui.numismatics.salepoint.energy": "Энергия",
+  "gui.numismatics.salepoint.fluid_empty": "Пусто",
+  "gui.numismatics.salepoint.fluid_filter_empty.0": "Жидкость",
+  "gui.numismatics.salepoint.fluid_filter_empty.1": "Клик предметом, содержащим жидкость, вроде ведра или бутылочки",
+  "gui.numismatics.salepoint.go": "Начать транзакцию",
+  "gui.numismatics.salepoint.insufficient_space": "Цель переполнена или не присоединена",
+  "gui.numismatics.salepoint.invalid_state": "Некорректное состояние",
+  "gui.numismatics.salepoint.no_card": "Нет карты",
+  "gui.numismatics.salepoint.no_filter": "Нет фильтра",
+  "gui.numismatics.salepoint.no_state": "Не настроено",
+  "gui.numismatics.salepoint.no_target": "Цель не обнаружена",
+  "gui.numismatics.salepoint.price": "Цена/Ед: %s %s, %s¤",
+  "gui.numismatics.salepoint.target_failed_purchase": "Цель неспособна совершить покупку",
+  "gui.numismatics.salepoint.target_not_controlled": "Цель не контролируется точкой розлива",
   "gui.numismatics.trust_list": "Список доверенных",
   "gui.numismatics.vendor.count": " (%sx)",
   "gui.numismatics.vendor.full": "Торговый автомат переполнен",