Latest

build.gradle

@@ -129,6 +129,7 @@ repositories {
 
     // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
+    mavenCentral()
     flatDir {
         dir 'libs'
     }
@@ -157,7 +158,9 @@ repositories {
         maven { url = "https://maven.bawnorton.com/releases" }
     }
 
-    mavenCentral()
+    maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
+    maven { url = "https://maven.ithundxr.dev/mirror" } // Registrate
+    maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort
 }
 
 
@@ -175,19 +178,24 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     // create dependencies
-    implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
-    implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
-    implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
+    implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
+    implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
+    compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
+    runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}"))
+    implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
+    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
+    implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
 
     // vs2 dependencies
-    implementation fg.deobf("org.valkyrienskies:valkyrienskies-120-forge:${vs2_version}") { transitive = false }
+/*    implementation fg.deobf("org.valkyrienskies:valkyrienskies-120-forge:${vs2_version}") { transitive = false }
 
     compileOnly ("org.valkyrienskies.core:api:${vs_core_version}")
     compileOnly ("org.valkyrienskies.core:api-game:${vs_core_version}")
     compileOnly ("org.valkyrienskies.core:util:${vs_core_version}")
     compileOnly ("org.valkyrienskies.core:impl:${vs_core_version}")
 
-    implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.3"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.3"*/
+
     implementation "thedarkcolour:kotlinforforge:$forge_kotlin_version"
 
     //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
@@ -197,26 +205,30 @@ dependencies {
     implementation("org.joml:joml-primitives:1.10.0") { transitive = false }
 
     // cc:t dependencies
-    implementation fg.deobf("curse.maven:cc-tweaked-282001:5714507")
+    implementation fg.deobf("libs:cc-tweaked-1.20.1-forge:${cc_version}")
+    runtimeOnly fg.deobf("libs:jei-1.20.1-forge:15.20.0.116")
+
+    runtimeOnly fg.deobf("libs:IconRenderer-Forge-1.20.1:1.2.0")
 
     //
     implementation fg.deobf("libs:peripheralium-forge:1.20.1-0.6.15")
     implementation fg.deobf("libs:peripheralworks-forge-1.20.1:1.4.3")
+    //runtimeOnly fg.deobf("libs:IconRenderer-Forge-1.20.1:1.2.0")
 
     compileOnly(annotationProcessor("com.bawnorton.mixinsquared:mixinsquared-common:0.2.0-beta.6"))
     implementation(jarJar("com.bawnorton.mixinsquared:mixinsquared-forge:0.2.0-beta.6")) {
         jarJar.ranged(it, "[0.2.0-beta.6,)")
     }
 
     // Tweaked Controllers dependencies
-    implementation fg.deobf("curse.maven:create-tweaked-controllers-898849:5206625")
+    compileOnly fg.deobf("curse.maven:create-tweaked-controllers-898849:5206625")
 
     // Toms peripheral
     //implementation fg.deobf("curse.maven:toms-peripheral-931210:5265063")
 
     // VS CW
     runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137938")
-    runtimeOnly fg.deobf("curse.maven:clockwork-807792:5580456")
+    //runtimeOnly fg.deobf("curse.maven:clockwork-807792:5580456")
 
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
@@ -268,16 +280,34 @@ tasks.named('jar', Jar).configure {
                 "MixinConfigs": "mixins.void_power.json"
         ])
     }
-
     // This is the preferred method to reobfuscate your jar file
     finalizedBy 'reobfJar'
 }
 
+
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
 // tasks.named('publish').configure {
 //     dependsOn 'reobfJar'
 // }
 
+tasks.named('jarJar').configure {
+    manifest {
+        attributes([
+                'Specification-Title'     : mod_id,
+                'Specification-Vendor'    : mod_authors,
+                'Specification-Version'   : '1', // We are version 1 of ourselves
+                'Implementation-Title'    : project.name,
+                'Implementation-Version'  : project.jar.archiveVersion,
+                'Implementation-Vendor'   : mod_authors,
+                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+                "MixinConfigs": "mixins.void_power.json"
+        ])
+    }
+
+    finalizedBy 'reobfJarJar'
+}
+
+
 // Example configuration to allow publishing using the maven-publish plugin
 publishing {
     publications {

gradle.properties

@@ -48,7 +48,7 @@ mod_name=VoidPower
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GPL3
 # The mod version. See https://semver.org/
-mod_version=1.2.7
+mod_version=1.2.9.no_vs
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -58,14 +58,14 @@ mod_authors=Tairitsu
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
 mod_description=
 
-
-create_minecraft_version = 1.20.1
-flywheel_minecraft_version = 1.20.1
-create_version = 0.5.1.f-26
-flywheel_version = 0.6.10-7
+create_version = 6.0.6-150
+ponder_version = 1.0.80
+flywheel_version = 1.0.4
 registrate_version = MC1.20-1.3.3
 
-vs2_version=2.1.3-beta.1+a52f38bd68
-vs_core_version=1.1.0+b19b27c4a4
+cc_version = 1.116.1
+
+vs2_version=2.3.0-beta.10
+vs_core_version=1.1.0+cf6990a85d
 
 forge_kotlin_version=4.10.0

src/generated/resources/assets/void_power/lang/en_us.json

@@ -7,6 +7,9 @@
   "block.void_power.redstone_router":"Wireless Redstone Router",
   "block.void_power.hologram":"Hologram",
   "item.void_power.vr_glasses": "VR Glasses",
+  "block.void_power.key_board": "Keyboard",
   "itemGroup.void_power.main": "Void Power",
-  "gui.void_power.terminal" : "HOLOGRAM"
+  "gui.void_power.terminal" : "HOLOGRAM",
+
+  "gui.void_power.key_board.actived": "[Using Keyboard]"
 }

src/generated/resources/assets/void_power/lang/zh_cn.json

@@ -7,7 +7,10 @@
   "block.void_power.redstone_broadcaster":"无线红石信号发射器",
   "block.void_power.redstone_router":"无线红石信号路由器",
   "item.void_power.vr_glasses": "VR眼镜(需绑定全息显示器)",
+  "block.void_power.key_board": "键盘",
   "item.void_power.channel_modifier": "信道修改器",
   "itemGroup.void_power.main": "虚空动力",
-  "gui.void_power.terminal" : "全息显示器(终端)"
+  "gui.void_power.terminal" : "全息显示器(终端)",
+
+  "gui.void_power.key_board.actived": "[正在使用键盘]"
 }

src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -1,7 +1,5 @@
 {
   "values": [
-    "void_power:void_engine",
-    "void_power:engine_controller",
     "void_power:glass_screen",
     "void_power:hologram"
   ]

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1,7 +1,5 @@
 {
   "values": [
-    "void_power:void_engine",
-    "void_power:engine_controller",
     "void_power:glass_screen",
     "void_power:hologram"
   ]

src/main/java/com/dfdyz/void_power/client/gui/ChannelModifierGUI.java

@@ -1,26 +1,20 @@
 package com.dfdyz.void_power.client.gui;
 
 import com.dfdyz.void_power.menu.ChannelModifierMenu;
-import com.dfdyz.void_power.menu.HologramMenu;
 import com.dfdyz.void_power.registry.VPItems;
-import com.dfdyz.void_power.registry.VPTileEntities;
 import com.dfdyz.void_power.utils.ParamUtils;
 import com.dfdyz.void_power.world.items.ChannelModifierItem;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class ChannelModifierGUI extends Screen implements MenuAccess<ChannelModifierMenu> {
@@ -36,6 +30,10 @@ public ChannelModifierGUI(ChannelModifierMenu menu, Inventory inventory, Compone
 
     Pattern channel_pattern = Pattern.compile("^[a-z][a-z0-9_]*:[a-z][a-z0-9_/]*+$");
 
+    @Override
+    public boolean isPauseScreen() {
+        return false;
+    }
 
     @Override
     protected void init() {

src/main/java/com/dfdyz/void_power/client/gui/HologramGUI.java

@@ -1,7 +1,6 @@
 package com.dfdyz.void_power.client.gui;
 
 import com.dfdyz.void_power.client.gui.widget.HologramTerminalWidget;
-import com.dfdyz.void_power.menu.HologramMenu;
 import com.dfdyz.void_power.network.CP.CP_HologramRename;
 import com.dfdyz.void_power.network.PacketManager;
 import com.dfdyz.void_power.world.blocks.hologram.HologramTE;
@@ -15,22 +14,18 @@
 import net.minecraft.world.entity.player.Inventory;
 import org.jetbrains.annotations.NotNull;
 
-public class HologramGUI extends Screen implements MenuAccess<HologramMenu> {
-    HologramTE te;
+public class HologramGUI extends Screen {
+    final HologramTE te;
     HologramTerminalWidget htw;
 
     EditBox name_editor;
     Button set_name;
 
     float terminal_scale = 1;
-    final HologramMenu menu;
 
-    public HologramGUI(HologramMenu menu, Inventory inventory, Component component) {
+    public HologramGUI(Component component, HologramTE te) {
         super(component);
-        this.menu = menu;
-        if(menu != null){
-            te = menu.te;
-        }
+        this.te = te;
     }
 
     float GetScale(){
@@ -87,11 +82,16 @@ public void ChangeName(Button b){
         PacketManager.sendToServer(new CP_HologramRename(te));
     }
 
+    @Override
+    public void onClose() {
+        super.onClose();
+    }
+
     @Override
     public void tick() {
         super.tick();
         if(te == null || te.isRemoved()) {
-            Minecraft.getInstance().setScreen(null);
+            onClose();
             return;
         }
         if(htw.ShouldResize()){
@@ -121,8 +121,4 @@ protected void setInitialFocus(GuiEventListener guiEventListener) {
         super.setInitialFocus(guiEventListener);
     }
 
-    @Override
-    public @NotNull HologramMenu getMenu() {
-        return menu;
-    }
 }

src/main/java/com/dfdyz/void_power/client/gui/IMouseHandlerExtension.java

@@ -0,0 +1,6 @@
+package com.dfdyz.void_power.client.gui;
+
+public interface IMouseHandlerExtension {
+    void void_power$grabMouseOnScreen();
+    void void_power$releaseMouseOnScreen();
+}