refactored package to my domain, updated to 1.16.5

AdvancedXRay · Feb 15, 2021 · 1fdcf52 · 1fdcf52
1 parent c82a4dc
commit 1fdcf52
Show file tree

Hide file tree

Showing 26 changed files with 110 additions and 133 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,13 +8,15 @@ buildscript {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
     }
 }
+
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
+apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
 version = mod_version
-group= "com.xray.xray"
-archivesBaseName = "xray-${game_version}"
+group= "pro.mikey.xray"
+archivesBaseName = "advanced-xray-forge-${game_version}"
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -24,11 +26,7 @@ minecraft {
     runs {
         client {
             workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -40,18 +38,11 @@ minecraft {
 
         server {
             workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            mods {
-                xray {
-                    source sourceSets.main
-                }
-            }
+            // Don't run the mod on the server. Well you could but why?
+            mods {}
         }
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx6G
 
-mod_version=2.6.0
-game_version=1.16.4
+mod_version=2.6.1
+game_version=1.16.5
 
 # Forge
-forge_version=35.1.13
+forge_version=36.0.26
 forge_mappings=20201028-1.16.3
diff --git a/src/main/java/com/xray/ClientController.java → ...java/pro/mikey/xray/ClientController.java b/src/main/java/com/xray/ClientController.java → ...java/pro/mikey/xray/ClientController.java
@@ -1,11 +1,11 @@
-package com.xray;
-
-import com.xray.keybinding.KeyBindings;
-import com.xray.store.BlockStore;
-import com.xray.store.GameBlockStore;
-import com.xray.store.JsonStore;
-import com.xray.utils.BlockData;
-import com.xray.xray.Controller;
+package pro.mikey.xray;
+
+import pro.mikey.xray.keybinding.KeyBindings;
+import pro.mikey.xray.store.BlockStore;
+import pro.mikey.xray.store.GameBlockStore;
+import pro.mikey.xray.store.JsonStore;
+import pro.mikey.xray.utils.BlockData;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;

diff --git a/src/main/java/com/xray/Configuration.java → ...in/java/pro/mikey/xray/Configuration.java b/src/main/java/com/xray/Configuration.java → ...in/java/pro/mikey/xray/Configuration.java
@@ -1,4 +1,4 @@
-package com.xray;
+package pro.mikey.xray;
 
 import net.minecraftforge.common.ForgeConfigSpec;
 

diff --git a/src/main/java/com/xray/XRay.java → src/main/java/pro/mikey/xray/XRay.java b/src/main/java/com/xray/XRay.java → src/main/java/pro/mikey/xray/XRay.java
@@ -1,4 +1,4 @@
-package com.xray;
+package pro.mikey.xray;
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;

diff --git a/src/main/java/com/xray/gui/GuiHelp.java → ...main/java/pro/mikey/xray/gui/GuiHelp.java b/src/main/java/com/xray/gui/GuiHelp.java → ...main/java/pro/mikey/xray/gui/GuiHelp.java
@@ -1,7 +1,7 @@
-package com.xray.gui;
+package pro.mikey.xray.gui;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.xray.gui.utils.GuiBase;
+import pro.mikey.xray.gui.utils.GuiBase;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.resources.I18n;

diff --git a/src/main/java/com/xray/gui/GuiOverlay.java → ...n/java/pro/mikey/xray/gui/GuiOverlay.java b/src/main/java/com/xray/gui/GuiOverlay.java → ...n/java/pro/mikey/xray/gui/GuiOverlay.java
@@ -1,9 +1,9 @@
-package com.xray.gui;
+package pro.mikey.xray.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.xray.Configuration;
-import com.xray.XRay;
-import com.xray.xray.Controller;
+import pro.mikey.xray.Configuration;
+import pro.mikey.xray.XRay;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resources.I18n;

diff --git a/...java/com/xray/gui/GuiSelectionScreen.java → ...ro/mikey/xray/gui/GuiSelectionScreen.java b/...java/com/xray/gui/GuiSelectionScreen.java → ...ro/mikey/xray/gui/GuiSelectionScreen.java
@@ -1,20 +1,20 @@
-package com.xray.gui;
+package pro.mikey.xray.gui;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.xray.ClientController;
-import com.xray.Configuration;
-import com.xray.XRay;
-import com.xray.gui.manage.GuiAddBlock;
-import com.xray.gui.manage.GuiBlockList;
-import com.xray.gui.manage.GuiEdit;
-import com.xray.gui.utils.GuiBase;
-import com.xray.gui.utils.ScrollingList;
-import com.xray.gui.utils.SupportButton;
-import com.xray.store.BlockStore;
-import com.xray.utils.BlockData;
-import com.xray.xray.Controller;
+import pro.mikey.xray.ClientController;
+import pro.mikey.xray.Configuration;
+import pro.mikey.xray.XRay;
+import pro.mikey.xray.gui.manage.GuiAddBlock;
+import pro.mikey.xray.gui.manage.GuiBlockList;
+import pro.mikey.xray.gui.manage.GuiEdit;
+import pro.mikey.xray.gui.utils.GuiBase;
+import pro.mikey.xray.gui.utils.ScrollingList;
+import pro.mikey.xray.gui.utils.SupportButton;
+import pro.mikey.xray.store.BlockStore;
+import pro.mikey.xray.utils.BlockData;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
@@ -299,4 +299,4 @@ public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_,
             }
         }
     }
-}
+}
diff --git a/...java/com/xray/gui/manage/GuiAddBlock.java → ...ro/mikey/xray/gui/manage/GuiAddBlock.java b/...java/com/xray/gui/manage/GuiAddBlock.java → ...ro/mikey/xray/gui/manage/GuiAddBlock.java
@@ -1,13 +1,13 @@
-package com.xray.gui.manage;
+package pro.mikey.xray.gui.manage;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.xray.ClientController;
-import com.xray.gui.GuiSelectionScreen;
-import com.xray.gui.utils.GuiBase;
-import com.xray.utils.BlockData;
-import com.xray.xray.Controller;
+import pro.mikey.xray.ClientController;
+import pro.mikey.xray.gui.GuiSelectionScreen;
+import pro.mikey.xray.gui.utils.GuiBase;
+import pro.mikey.xray.utils.BlockData;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.widget.TextFieldWidget;

diff --git a/...ava/com/xray/gui/manage/GuiBlockList.java → ...o/mikey/xray/gui/manage/GuiBlockList.java b/...ava/com/xray/gui/manage/GuiBlockList.java → ...o/mikey/xray/gui/manage/GuiBlockList.java
@@ -1,11 +1,10 @@
-package com.xray.gui.manage;
+package pro.mikey.xray.gui.manage;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.xray.ClientController;
-import com.xray.gui.GuiSelectionScreen;
-import com.xray.gui.utils.GuiBase;
-import com.xray.gui.utils.ScrollingList;
-import com.xray.store.GameBlockStore.BlockWithItemStack;
+import pro.mikey.xray.ClientController;
+import pro.mikey.xray.gui.GuiSelectionScreen;
+import pro.mikey.xray.gui.utils.GuiBase;
+import pro.mikey.xray.gui.utils.ScrollingList;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.widget.TextFieldWidget;
@@ -15,6 +14,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
+import pro.mikey.xray.store.GameBlockStore;
 
 import javax.annotation.Nullable;
 import java.awt.*;
@@ -24,7 +24,7 @@
 
 public class GuiBlockList extends GuiBase {
     private ScrollingBlockList blockList;
-    private ArrayList<BlockWithItemStack> blocks;
+    private ArrayList<GameBlockStore.BlockWithItemStack> blocks;
     private TextFieldWidget search;
     private String lastSearched = "";
 
@@ -96,7 +96,7 @@ public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3
     static class ScrollingBlockList extends ScrollingList<ScrollingBlockList.BlockSlot> {
         static final int SLOT_HEIGHT = 35;
 
-        ScrollingBlockList(int x, int y, int width, int height, List<BlockWithItemStack> blocks) {
+        ScrollingBlockList(int x, int y, int width, int height, List<GameBlockStore.BlockWithItemStack> blocks) {
             super(x, y, width, height, SLOT_HEIGHT);
             this.updateEntries(blocks);
         }
@@ -110,21 +110,21 @@ public void setSelected(@Nullable BlockSlot entry) {
             Minecraft.getInstance().displayGuiScreen(new GuiAddBlock(entry.getBlock().getBlock(), GuiBlockList::new));
         }
 
-        void updateEntries(List<BlockWithItemStack> blocks) {
+        void updateEntries(List<GameBlockStore.BlockWithItemStack> blocks) {
             this.clearEntries(); // @mcp: func_230963_j_ = clearEntries
             blocks.forEach(block -> this.addEntry(new BlockSlot(block, this)));
         }
 
         public static class BlockSlot extends AbstractList.AbstractListEntry<ScrollingBlockList.BlockSlot> {
-            BlockWithItemStack block;
+            GameBlockStore.BlockWithItemStack block;
             ScrollingBlockList parent;
 
-            BlockSlot(BlockWithItemStack block, ScrollingBlockList parent) {
+            BlockSlot(GameBlockStore.BlockWithItemStack block, ScrollingBlockList parent) {
                 this.block = block;
                 this.parent = parent;
             }
 
-            public BlockWithItemStack getBlock() {
+            public GameBlockStore.BlockWithItemStack getBlock() {
                 return block;
             }
 

diff --git a/...ain/java/com/xray/gui/manage/GuiEdit.java → ...va/pro/mikey/xray/gui/manage/GuiEdit.java b/...ain/java/com/xray/gui/manage/GuiEdit.java → ...va/pro/mikey/xray/gui/manage/GuiEdit.java
@@ -1,11 +1,11 @@
-package com.xray.gui.manage;
+package pro.mikey.xray.gui.manage;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.xray.ClientController;
-import com.xray.gui.GuiSelectionScreen;
-import com.xray.gui.utils.GuiBase;
-import com.xray.utils.BlockData;
-import com.xray.xray.Controller;
+import pro.mikey.xray.ClientController;
+import pro.mikey.xray.gui.GuiSelectionScreen;
+import pro.mikey.xray.gui.utils.GuiBase;
+import pro.mikey.xray.utils.BlockData;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.renderer.RenderHelper;

diff --git a/...main/java/com/xray/gui/utils/GuiBase.java → ...ava/pro/mikey/xray/gui/utils/GuiBase.java b/...main/java/com/xray/gui/utils/GuiBase.java → ...ava/pro/mikey/xray/gui/utils/GuiBase.java
@@ -1,10 +1,8 @@
-package com.xray.gui.utils;
+package pro.mikey.xray.gui.utils;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.xray.XRay;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BedBlock;
+import pro.mikey.xray.XRay;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.Widget;

diff --git a/...ava/com/xray/gui/utils/ScrollingList.java → ...o/mikey/xray/gui/utils/ScrollingList.java b/...ava/com/xray/gui/utils/ScrollingList.java → ...o/mikey/xray/gui/utils/ScrollingList.java
@@ -1,4 +1,4 @@
-package com.xray.gui.utils;
+package pro.mikey.xray.gui.utils;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.block.GrindstoneBlock;
@@ -16,6 +16,8 @@ public class ScrollingList<E extends AbstractList.AbstractListEntry<E>> extends
     public ScrollingList(int x, int y, int width, int height, int slotHeightIn) {
         super(Minecraft.getInstance(), width, height, y - (height / 2), (y - (height / 2)) + height, slotHeightIn);
         this.setLeftPos(x - (width / 2));
+        this.func_244605_b(false);
+        this.func_244606_c(false); // removes background
     }
 
     @Override

diff --git a/...ava/com/xray/gui/utils/SupportButton.java → ...o/mikey/xray/gui/utils/SupportButton.java b/...ava/com/xray/gui/utils/SupportButton.java → ...o/mikey/xray/gui/utils/SupportButton.java
@@ -1,5 +1,6 @@
-package com.xray.gui.utils;
+package pro.mikey.xray.gui.utils;
 
+import net.minecraft.client.gui.widget.GameSettingsSlider;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.ITextProperties;

diff --git a/...java/com/xray/keybinding/KeyBindings.java → ...ro/mikey/xray/keybinding/KeyBindings.java b/...java/com/xray/keybinding/KeyBindings.java → ...ro/mikey/xray/keybinding/KeyBindings.java
@@ -1,8 +1,7 @@
-package com.xray.keybinding;
+package pro.mikey.xray.keybinding;
 
-import com.xray.XRay;
-import com.xray.gui.GuiSelectionScreen;
-import com.xray.xray.Controller;
+import pro.mikey.xray.gui.GuiSelectionScreen;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;

diff --git a/src/main/java/com/xray/store/BlockStore.java → ...java/pro/mikey/xray/store/BlockStore.java b/src/main/java/com/xray/store/BlockStore.java → ...java/pro/mikey/xray/store/BlockStore.java
@@ -1,6 +1,6 @@
-package com.xray.store;
+package pro.mikey.xray.store;
 
-import com.xray.utils.BlockData;
+import pro.mikey.xray.utils.BlockData;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

diff --git a/...n/java/com/xray/store/GameBlockStore.java → .../pro/mikey/xray/store/GameBlockStore.java b/...n/java/com/xray/store/GameBlockStore.java → .../pro/mikey/xray/store/GameBlockStore.java
@@ -1,6 +1,6 @@
-package com.xray.store;
+package pro.mikey.xray.store;
 
-import com.xray.xray.Controller;
+import pro.mikey.xray.xray.Controller;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.item.Item;

diff --git a/src/main/java/com/xray/store/JsonStore.java → .../java/pro/mikey/xray/store/JsonStore.java b/src/main/java/com/xray/store/JsonStore.java → .../java/pro/mikey/xray/store/JsonStore.java
@@ -1,11 +1,11 @@
-package com.xray.store;
+package pro.mikey.xray.store;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
-import com.xray.XRay;
-import com.xray.utils.BlockData;
+import pro.mikey.xray.XRay;
+import pro.mikey.xray.utils.BlockData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.common.Tags;

diff --git a/src/main/java/com/xray/utils/BlockData.java → .../java/pro/mikey/xray/utils/BlockData.java b/src/main/java/com/xray/utils/BlockData.java → .../java/pro/mikey/xray/utils/BlockData.java
@@ -1,4 +1,4 @@
-package com.xray.utils;
+package pro.mikey.xray.utils;
 
 import net.minecraft.item.ItemStack;
 

diff --git a/src/main/java/com/xray/utils/Region.java → ...ain/java/pro/mikey/xray/utils/Region.java b/src/main/java/com/xray/utils/Region.java → ...ain/java/pro/mikey/xray/utils/Region.java
@@ -1,4 +1,4 @@
-package com.xray.utils;
+package pro.mikey.xray.utils;
 
 import net.minecraft.util.math.vector.Vector3i;
 

diff --git a/...java/com/xray/utils/RenderBlockProps.java → ...ro/mikey/xray/utils/RenderBlockProps.java b/...java/com/xray/utils/RenderBlockProps.java → ...ro/mikey/xray/utils/RenderBlockProps.java
@@ -1,10 +1,7 @@
-package com.xray.utils;
+package pro.mikey.xray.utils;
 
 import com.google.common.base.Objects;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.math.vector.Vector3i;
 
 import javax.annotation.concurrent.Immutable;
 

diff --git a/src/main/java/com/xray/xray/Controller.java → .../java/pro/mikey/xray/xray/Controller.java b/src/main/java/com/xray/xray/Controller.java → .../java/pro/mikey/xray/xray/Controller.java
@@ -1,9 +1,8 @@
-package com.xray.xray;
+package pro.mikey.xray.xray;
 
-import com.xray.Configuration;
-import com.xray.XRay;
-import com.xray.store.BlockStore;
-import com.xray.utils.Region;
+import pro.mikey.xray.Configuration;
+import pro.mikey.xray.store.BlockStore;
+import pro.mikey.xray.utils.Region;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/com/xray/xray/Events.java → ...main/java/pro/mikey/xray/xray/Events.java b/src/main/java/com/xray/xray/Events.java → ...main/java/pro/mikey/xray/xray/Events.java
@@ -1,6 +1,6 @@
-package com.xray.xray;
+package pro.mikey.xray.xray;
 
-import com.xray.XRay;
+import pro.mikey.xray.XRay;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderWorldLastEvent;