Skip to content
This repository has been archived by the owner on Jan 21, 2023. It is now read-only.

Commit

Permalink
兼容 Rubidium
Browse files Browse the repository at this point in the history
  • Loading branch information
TexBlock committed Jul 10, 2022
1 parent 63a035e commit 8fadff1
Show file tree
Hide file tree
Showing 55 changed files with 115 additions and 135 deletions.
4 changes: 4 additions & 0 deletions README-EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ English / [简体中文](README.md) / [Original README(English)](Original Repo i
### WHAT IS THIS?
Magnesium / Rubidium Extras do NOT SUPPORT localization (hardcoded), this Fork modifies the code to support localization.

### Download

1.16.5 : [MagnesiumExtras-mc1.16.5_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.16-v1.3.2-i18n)

1.16.5 Compatibility Rubidium : [RubidiumExtras-mc1.16.5_v1.3.2-Compatibility](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.16-v1.3.2-Compatibility)

1.18.2 : [RubidiumExtras-mc1.18.2_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.18-v1.3.2-i18n)

### Link
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
### 这是干什么的?
Magnesium / Rubidium Extras 不支持本地化(硬编码),本Fork修改代码让其支持本地化。翻译问题请到issues反馈。

### 下载

1.16.5 : [MagnesiumExtras-mc1.16.5_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.16-v1.3.2-i18n)

1.16.5 兼容 Rubidium : [RubidiumExtras-mc1.16.5_v1.3.2-Compatibility](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.16-v1.3.2-Compatibility)

1.18.2 : [RubidiumExtras-mc1.18.2_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.18-v1.3.2-i18n)

### 友情链接
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ dependencies {

minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

compileOnly fg.deobf("curse.maven:magnesium-532724:3526076")
runtimeOnly fg.deobf("curse.maven:magnesium-532724:3526076")
compileOnly fg.deobf("curse.maven:rubidium-574856:3840890")
runtimeOnly fg.deobf("curse.maven:rubidium-574856:3840890")

runtimeOnly fg.deobf("curse.maven:dynlights-551736:3574974")

Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ org.gradle.jvmargs = -Xmx3G
org.gradle.daemon = false

# mod version info
mod_id = magnesium_extras
mod_version = 1.3.2-i18n
mod_id = rubidium_extras
mod_version = 1.3.2-Compatibility
minecraft_version = 1.16.5
forge_version = 36.2.0
mappings_version=2021.10.17-1.16.5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,49 +1,37 @@
package vice.magnesium_extras;
package vice.rubidium_extras;

import dev.ftb.mods.ftbchunks.data.ClaimedChunk;
import dev.ftb.mods.ftbchunks.data.FTBChunksAPI;
import dev.ftb.mods.ftblibrary.math.ChunkDimPos;
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
import net.minecraft.block.Block;
import net.minecraft.client.AbstractOption;
import net.minecraft.fluid.Fluid;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.fml.network.FMLNetworkConstants;
import net.minecraftforge.registries.IRegistryDelegate;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.magnesium_extras.features.Zoom.ZoomUtils;
import vice.magnesium_extras.keybinds.KeyboardInput;
import vice.magnesium_extras.util.chunks.DummyChunkClaimProvider;
import vice.magnesium_extras.util.chunks.IChunkClaimProvider;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.util.chunks.DummyChunkClaimProvider;
import vice.rubidium_extras.util.chunks.IChunkClaimProvider;

import java.lang.reflect.Field;

@Mod("magnesium_extras")
@Mod("rubidium_extras")
public class MagnesiumExtras
{
public static final String MODID = "magnesium_extras";
public static final String MODID = "rubidium_extras";
public static final Logger LOGGER = LogManager.getLogger();
public static IChunkClaimProvider chunkClaimProvider;

public MagnesiumExtras() {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
MinecraftForge.EVENT_BUS.register(this);

MagnesiumExtrasConfig.loadConfig(FMLPaths.CONFIGDIR.get().resolve("magnesium_extras.toml"));
MagnesiumExtrasConfig.loadConfig(FMLPaths.CONFIGDIR.get().resolve("rubidium_extras.toml"));

//MinecraftForge.EVENT_BUS.register(this);

Expand All @@ -54,7 +42,7 @@ public MagnesiumExtras() {
final Field sodiumOptsField = SodiumGameOptionPages.class.getDeclaredField("sodiumOpts");
sodiumOptsField.setAccessible(true);
SodiumOptionsStorage sodiumOpts = (SodiumOptionsStorage) sodiumOptsField.get(null);
sodiumOpts.getData().experimental.displayFps = false;
//sodiumOpts.getData().experimental.displayFps = false;
sodiumOpts.save();
}
catch (Throwable t) {
Expand All @@ -70,8 +58,8 @@ private void setup(final FMLCommonSetupEvent event)
{
try
{
chunkClaimProvider = Class.forName("vice.magnesium_extras.util.chunks.ActiveChunkClaimProvider").asSubclass(IChunkClaimProvider.class).newInstance();
LOGGER.info("Found FTB Chunks, enabling MagnesiumExtras integration.");
chunkClaimProvider = Class.forName("vice.rubidium_extras.util.chunks.ActiveChunkClaimProvider").asSubclass(IChunkClaimProvider.class).newInstance();
LOGGER.info("Found FTB Chunks, enabling RubidiumExtras integration.");
}
catch (Exception e)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.config;
package vice.rubidium_extras.config;

import net.minecraftforge.common.ForgeConfigSpec;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.config;
package vice.rubidium_extras.config;

import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.io.WritingMode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.features.FadeInChunks;
package vice.rubidium_extras.features.FadeInChunks;

import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.ChunkDrawParamsVector;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package vice.magnesium_extras.features.FadeInChunks;
package vice.rubidium_extras.features.FadeInChunks;

import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderContainer;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.features.FrameCounter;
package vice.rubidium_extras.features.FrameCounter;

import lombok.val;
import net.minecraft.client.Minecraft;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package vice.magnesium_extras.features.FrameCounter;
package vice.rubidium_extras.features.FrameCounter;

import lombok.Getter;
import lombok.val;
import net.minecraft.client.Minecraft;
import net.minecraft.util.FrameTimer;
import net.minecraft.util.math.MathHelper;
import vice.magnesium_extras.mixins.FrameCounter.FpsAccessorMixin;
import vice.rubidium_extras.mixins.FrameCounter.FpsAccessorMixin;

public class MinFrameProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
******************************************************************************/
package vice.magnesium_extras.features.TotalDarkness;
package vice.rubidium_extras.features.TotalDarkness;


import net.minecraft.client.Minecraft;
Expand All @@ -30,7 +30,7 @@
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;


@Mod.EventBusSubscriber(modid = "magnesium_extras", bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
******************************************************************************/

package vice.magnesium_extras.features.TotalDarkness;
package vice.rubidium_extras.features.TotalDarkness;

public interface LightmapAccess {
boolean darkness_isDirty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
******************************************************************************/

package vice.magnesium_extras.features.TotalDarkness;
package vice.rubidium_extras.features.TotalDarkness;

public interface TextureAccess {
void darkness_enableUploadHook();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package vice.magnesium_extras.features.Zoom;
package vice.rubidium_extras.features.Zoom;

import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import vice.magnesium_extras.MagnesiumExtras;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.magnesium_extras.keybinds.KeyboardInput;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.keybinds.KeyboardInput;

@Mod.EventBusSubscriber(modid = "magnesium_extras", bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class ZoomHandler {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package vice.magnesium_extras.features.Zoom;
package vice.rubidium_extras.features.Zoom;

import net.minecraft.util.math.MathHelper;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;

//The class that contains most of the logic behind the zoom itself.
public class ZoomUtils {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.keybinds;
package vice.rubidium_extras.keybinds;

import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
package vice.magnesium_extras.keybinds;
package vice.rubidium_extras.keybinds;

import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.client.util.InputMappings;
import net.minecraft.network.play.client.CEntityActionPacket;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.client.settings.KeyConflictContext;
import net.minecraftforge.client.settings.KeyModifier;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.lwjgl.glfw.GLFW;
import vice.magnesium_extras.MagnesiumExtras;
import vice.rubidium_extras.MagnesiumExtras;

@Mod.EventBusSubscriber(value = Dist.CLIENT)
public class KeyboardInput
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package vice.magnesium_extras.mixins.BorderlessFullscreen;
package vice.rubidium_extras.mixins.BorderlessFullscreen;

import net.minecraft.client.MainWindow;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

@Mixin(MainWindow.class)
public interface MainWindowAccessor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package vice.magnesium_extras.mixins.BorderlessFullscreen;
package vice.rubidium_extras.mixins.BorderlessFullscreen;

import net.minecraft.client.MainWindow;
import org.lwjgl.glfw.GLFW;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;

@Mixin({MainWindow.class})
public class WindowMixin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.mixins.CloudHeight;
package vice.rubidium_extras.mixins.CloudHeight;

import net.minecraft.client.world.DimensionRenderInfo;
import org.spongepowered.asm.mixin.Final;
Expand All @@ -7,7 +7,7 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;

@Mixin(value = DimensionRenderInfo.class)
public class CloudHeightMixin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.mixins.EntityDistance;
package vice.rubidium_extras.mixins.EntityDistance;

import net.minecraft.client.renderer.culling.ClippingHelper;
import net.minecraft.client.renderer.entity.EntityRendererManager;
Expand All @@ -7,8 +7,8 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.magnesium_extras.util.DistanceUtility;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.util.DistanceUtility;

@Mixin(EntityRendererManager.class)
public class MaxDistanceEntity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.mixins.EntityDistance;
package vice.rubidium_extras.mixins.EntityDistance;

import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
Expand All @@ -8,8 +8,8 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import vice.magnesium_extras.config.MagnesiumExtrasConfig;
import vice.magnesium_extras.util.DistanceUtility;
import vice.rubidium_extras.config.MagnesiumExtrasConfig;
import vice.rubidium_extras.util.DistanceUtility;

@Mixin(TileEntityRendererDispatcher.class)
public class MaxDistanceTileEntity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package vice.magnesium_extras.mixins.FadeInChunks;
package vice.rubidium_extras.mixins.FadeInChunks;

import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderContainer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import vice.magnesium_extras.features.FadeInChunks.ChunkGraphicsStateExt;
import vice.rubidium_extras.features.FadeInChunks.ChunkGraphicsStateExt;

@Mixin(value = ChunkGraphicsState.class, remap = false)
public abstract class ChunkGraphicsStateMixin implements ChunkGraphicsStateExt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package vice.magnesium_extras.mixins.FadeInChunks;
package vice.rubidium_extras.mixins.FadeInChunks;

import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.MultidrawGraphicsState;
import me.jellysquid.mods.sodium.client.render.chunk.backends.oneshot.ChunkOneshotGraphicsState;
import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkProgram;
import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkRenderShaderBackend;
import net.minecraft.util.Util;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package vice.magnesium_extras.mixins.FadeInChunks;
package vice.rubidium_extras.mixins.FadeInChunks;

import me.jellysquid.mods.sodium.client.gl.device.CommandList;
import me.jellysquid.mods.sodium.client.render.chunk.ChunkCameraContext;
Expand All @@ -18,8 +18,8 @@
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import static vice.magnesium_extras.features.FadeInChunks.ChunkDrawParamsVectorExt.ext;
import static vice.magnesium_extras.features.FadeInChunks.ChunkGraphicsStateExt.ext;
import static vice.rubidium_extras.features.FadeInChunks.ChunkDrawParamsVectorExt.ext;
import static vice.rubidium_extras.features.FadeInChunks.ChunkGraphicsStateExt.ext;

@Mixin(value = MultidrawChunkRenderBackend.class, remap = false)
public abstract class GL43ChunkRenderBackendMixin extends ChunkRenderShaderBackendMixin<MultidrawGraphicsState> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package vice.magnesium_extras.mixins.FadeInChunks;
package vice.rubidium_extras.mixins.FadeInChunks;

import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.ChunkDrawParamsVector;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import vice.magnesium_extras.features.FadeInChunks.ChunkDrawParamsVectorExt;
import vice.rubidium_extras.features.FadeInChunks.ChunkDrawParamsVectorExt;

@Mixin(value = ChunkDrawParamsVector.NioChunkDrawCallVector.class, remap = false)
public abstract class NioChunkDrawCallVectorMixin extends ChunkDrawParamsVector implements ChunkDrawParamsVectorExt
Expand Down
Loading

0 comments on commit 8fadff1

Please sign in to comment.