Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix client only fields being used in a common environment

Browse source 
Changes to be committed:
	modified:   src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java
	modified:   src/main/java/org/dimdev/dimdoors/block/EternalFluidBlock.java
	modified:   src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/DetachedRiftBlockEntity.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/RiftData.java
	modified:   src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java
	modified:   src/main/java/org/dimdev/dimdoors/client/config/LoadConfigScreen.java
	modified:   src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItem.java
	modified:   src/main/java/org/dimdev/dimdoors/item/RiftBladeItem.java
	modified:   src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
	modified:   src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java
	modified:   src/main/java/org/dimdev/dimdoors/item/RiftStabilizerItem.java
This commit is contained in:
SD 2020-10-04 11:24:50 +05:30
parent c9e3979917
commit ab105b69ef
No known key found for this signature in database
GPG key ID: E36B57EE08544BC5
13 changed files with 32 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java
View file

@ -93,7 +93,7 @@ public class DimensionalDoorBlock extends DoorBlock implements RiftProvider<Entr
} else if (topEntity instanceof EntranceRiftBlockEntity) { } else if (topEntity instanceof EntranceRiftBlockEntity) {
return (EntranceRiftBlockEntity) topEntity; return (EntranceRiftBlockEntity) topEntity;
} else { } else {
throw new RuntimeException("Dimensional door at " + pos + " in world " + world + " contained no rift."); throw new IllegalStateException("Dimensional door at " + pos + " in world " + world + " contained no rift.");
} }
} }
} }

5
src/main/java/org/dimdev/dimdoors/block/EternalFluidBlock.java
View file

@ -26,9 +26,4 @@ public class EternalFluidBlock extends FluidBlock {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Override
public void onSteppedOn(World world, BlockPos pos, Entity entity) {
super.onSteppedOn(world, pos, entity);
}
} }

10
src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java
View file

@ -42,16 +42,6 @@ public class UnravelledFabricBlock extends Block {
return state; return state;
} }
// @Override
// public void onBroken(WorldAccess world, BlockPos pos, BlockState state) {
// this.getStateForNeighborUpdate(state, null, null, world, null, null);
// }
//
// @Override
// public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
// this.getStateForNeighborUpdate(state, null, null, world, null, null);
// }
@Override @Override
public boolean hasRandomTicks(BlockState state) { public boolean hasRandomTicks(BlockState state) {
return true; return true;

1
src/main/java/org/dimdev/dimdoors/block/entity/DetachedRiftBlockEntity.java
View file

@ -17,7 +17,6 @@ import net.minecraft.util.Tickable;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
public class DetachedRiftBlockEntity extends RiftBlockEntity implements Tickable { public class DetachedRiftBlockEntity extends RiftBlockEntity implements Tickable {
private static final Random random = new Random(); private static final Random random = new Random();

2
src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java
View file

@ -33,6 +33,7 @@ import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
public abstract class RiftBlockEntity extends BlockEntity implements BlockEntityClientSerializable, Target, EntityTarget { public abstract class RiftBlockEntity extends BlockEntity implements BlockEntityClientSerializable, Target, EntityTarget {
private static final Codec<RiftData> CODEC = RiftData.CODEC; private static final Codec<RiftData> CODEC = RiftData.CODEC;
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
public static long showRiftCoreUntil = 0;
protected RiftData data = new RiftData(); protected RiftData data = new RiftData();
@ -204,7 +205,6 @@ public abstract class RiftBlockEntity extends BlockEntity implements BlockEntity
protected abstract boolean isDetached(); protected abstract boolean isDetached();
public void copyFrom(DetachedRiftBlockEntity rift) { public void copyFrom(DetachedRiftBlockEntity rift) {
this.data.setDestination(rift.data.getDestination()); this.data.setDestination(rift.data.getDestination());
this.data.setProperties(rift.data.getProperties()); this.data.setProperties(rift.data.getProperties());
this.data.setAlwaysDelete(rift.data.isAlwaysDelete()); this.data.setAlwaysDelete(rift.data.isAlwaysDelete());

28
src/main/java/org/dimdev/dimdoors/block/entity/RiftData.java
View file

@ -7,15 +7,13 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
public class RiftData { public class RiftData {
public static Codec<RiftData> CODEC = RecordCodecBuilder.create(instance -> { public static Codec<RiftData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
return instance.group( VirtualTarget.CODEC.optionalFieldOf("destination", VirtualTarget.NoneTarget.DUMMY).forGetter(RiftData::getDestination),
VirtualTarget.CODEC.optionalFieldOf("destination", VirtualTarget.NoneTarget.DUMMY).forGetter(RiftData::getDestination), LinkProperties.CODEC.optionalFieldOf("properties", LinkProperties.NONE).forGetter(RiftData::getProperties),
LinkProperties.CODEC.optionalFieldOf("properties", LinkProperties.NONE).forGetter(RiftData::getProperties), Codec.BOOL.fieldOf("alwaysDelete").forGetter(RiftData::isAlwaysDelete),
Codec.BOOL.fieldOf("alwaysDelete").forGetter(RiftData::isAlwaysDelete), Codec.BOOL.fieldOf("forcedColor").forGetter(RiftData::isForcedColor),
Codec.BOOL.fieldOf("forcedColor").forGetter(RiftData::isForcedColor), RGBA.CODEC.optionalFieldOf("color", RGBA.NONE).forGetter(RiftData::getColor)
RGBA.CODEC.optionalFieldOf("color", RGBA.NONE).forGetter(RiftData::getColor) ).apply(instance, RiftData::new));
).apply(instance, RiftData::new);
});
private VirtualTarget destination = VirtualTarget.NoneTarget.DUMMY; // How the rift acts as a source private VirtualTarget destination = VirtualTarget.NoneTarget.DUMMY; // How the rift acts as a source
private LinkProperties properties = LinkProperties.NONE; private LinkProperties properties = LinkProperties.NONE;
@ -34,7 +32,7 @@ public class RiftData {
} }
public VirtualTarget getDestination() { public VirtualTarget getDestination() {
return destination; return this.destination;
} }
public void setDestination(VirtualTarget destination) { public void setDestination(VirtualTarget destination) {
@ -42,7 +40,7 @@ public class RiftData {
} }
public LinkProperties getProperties() { public LinkProperties getProperties() {
return properties; return this.properties;
} }
public void setProperties(LinkProperties properties) { public void setProperties(LinkProperties properties) {
@ -50,7 +48,7 @@ public class RiftData {
} }
public boolean isAlwaysDelete() { public boolean isAlwaysDelete() {
return alwaysDelete; return this.alwaysDelete;
} }
public void setAlwaysDelete(boolean alwaysDelete) { public void setAlwaysDelete(boolean alwaysDelete) {
@ -58,7 +56,7 @@ public class RiftData {
} }
public boolean isForcedColor() { public boolean isForcedColor() {
return forcedColor; return this.forcedColor;
} }
public void setForcedColor(boolean forcedColor) { public void setForcedColor(boolean forcedColor) {
@ -66,11 +64,11 @@ public class RiftData {
} }
public RGBA getColor() { public RGBA getColor() {
return color; return this.color;
} }
public void setColor(RGBA color) { public void setColor(RGBA color) {
forcedColor = color != null; this.forcedColor = color != null;
this.color = color; this.color = color;
} }
} }

8
src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java
View file

@ -4,6 +4,7 @@ import java.util.Objects;
import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity; import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.client.tesseract.Tesseract; import org.dimdev.dimdoors.client.tesseract.Tesseract;
import org.dimdev.dimdoors.util.RGBA; import org.dimdev.dimdoors.util.RGBA;
import com.flowpowered.math.TrigMath; import com.flowpowered.math.TrigMath;
@ -26,7 +27,6 @@ public class DetachedRiftBlockEntityRenderer extends BlockEntityRenderer<Detache
private static final Tesseract TESSERACT = new Tesseract(); private static final Tesseract TESSERACT = new Tesseract();
private static final RiftCurves.PolygonInfo CURVE = RiftCurves.CURVES.get(0); private static final RiftCurves.PolygonInfo CURVE = RiftCurves.CURVES.get(0);
public static long showRiftCoreUntil = 0;
public DetachedRiftBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher) { public DetachedRiftBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher) {
super(dispatcher); super(dispatcher);
@ -39,7 +39,7 @@ public class DetachedRiftBlockEntityRenderer extends BlockEntityRenderer<Detache
if (ModConfig.INSTANCE.getGraphicsConfig().showRiftCore) { if (ModConfig.INSTANCE.getGraphicsConfig().showRiftCore) {
this.renderTesseract(vcs.getBuffer(MyRenderLayer.TESSERACT), rift, matrices, tickDelta); this.renderTesseract(vcs.getBuffer(MyRenderLayer.TESSERACT), rift, matrices, tickDelta);
} else { } else {
long timeLeft = showRiftCoreUntil - System.currentTimeMillis(); long timeLeft = RiftBlockEntity.showRiftCoreUntil - System.currentTimeMillis();
if (timeLeft >= 0) { if (timeLeft >= 0) {
this.renderTesseract(vcs.getBuffer(MyRenderLayer.TESSERACT), rift, matrices, tickDelta); this.renderTesseract(vcs.getBuffer(MyRenderLayer.TESSERACT), rift, matrices, tickDelta);
} }
@ -72,8 +72,8 @@ public class DetachedRiftBlockEntityRenderer extends BlockEntityRenderer<Detache
matrices.pop(); matrices.pop();
} }
private double nextAngle(DetachedRiftBlockEntity rift, float partialTicks) { private double nextAngle(DetachedRiftBlockEntity rift, float tickDelta) {
rift.renderAngle = (rift.renderAngle + 5 * partialTicks) % 360; rift.renderAngle = (rift.renderAngle + 5 * tickDelta) % 360;
return rift.renderAngle; return rift.renderAngle;
} }
} }

4
src/main/java/org/dimdev/dimdoors/client/config/LoadConfigScreen.java
View file

@ -22,7 +22,7 @@ public class LoadConfigScreen extends Screen {
@Override @Override
public void onClose() { public void onClose() {
MinecraftClient.getInstance().openScreen(this.parent); MinecraftClient.getInstance().openScreen(this.getParent());
} }
public Screen getParent() { public Screen getParent() {
@ -39,7 +39,7 @@ public class LoadConfigScreen extends Screen {
@Override @Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
this.renderBackgroundTexture(0);
super.render(matrices, mouseX, mouseY, delta); super.render(matrices, mouseX, mouseY, delta);
this.renderBackground(matrices);
} }
} }

4
src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItem.java
View file

@ -7,7 +7,7 @@ import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.block.RiftProvider; import org.dimdev.dimdoors.block.RiftProvider;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity; import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.block.entity.EntranceRiftBlockEntity; import org.dimdev.dimdoors.block.entity.EntranceRiftBlockEntity;
import org.dimdev.dimdoors.client.DetachedRiftBlockEntityRenderer; import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -44,7 +44,7 @@ public class DimensionalDoorItem extends TallBlockItem {
if (context.getWorld().isClient) { if (context.getWorld().isClient) {
context.getPlayer().sendMessage(new TranslatableText("rifts.entrances.rift_too_close"), true); context.getPlayer().sendMessage(new TranslatableText("rifts.entrances.rift_too_close"), true);
DetachedRiftBlockEntityRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor; RiftBlockEntity.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor;
} }
return ActionResult.FAIL; return ActionResult.FAIL;

7
src/main/java/org/dimdev/dimdoors/item/RiftBladeItem.java
View file

@ -1,8 +1,9 @@
package org.dimdev.dimdoors.item; package org.dimdev.dimdoors.item;
import java.util.Objects;
import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity; import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.client.DetachedRiftBlockEntityRenderer;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -32,7 +33,7 @@ public class RiftBladeItem extends SwordItem {
@Override @Override
public boolean canRepair(ItemStack item, ItemStack repairingItem) { public boolean canRepair(ItemStack item, ItemStack repairingItem) {
return ModItems.STABLE_FABRIC == repairingItem.getItem(); return Objects.equals(ModItems.STABLE_FABRIC, repairingItem.getItem());
} }
@Override @Override
@ -48,7 +49,7 @@ public class RiftBladeItem extends SwordItem {
return new TypedActionResult<>(ActionResult.SUCCESS, stack); return new TypedActionResult<>(ActionResult.SUCCESS, stack);
} else { } else {
player.sendMessage(new TranslatableText(this.getTranslationKey() + ".rift_miss"), true); player.sendMessage(new TranslatableText(this.getTranslationKey() + ".rift_miss"), true);
DetachedRiftBlockEntityRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor; RiftBlockEntity.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor;
return new TypedActionResult<>(ActionResult.FAIL, stack); return new TypedActionResult<>(ActionResult.FAIL, stack);
} }
} }

3
src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
View file

@ -4,7 +4,6 @@ import java.util.List;
import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity; import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.client.DetachedRiftBlockEntityRenderer;
import net.minecraft.client.item.TooltipContext; import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
@ -39,7 +38,7 @@ public class RiftConfigurationToolItem extends Item {
if (world.isClient) { if (world.isClient) {
if (!RaycastHelper.hitsRift(hit, world)) { if (!RaycastHelper.hitsRift(hit, world)) {
player.sendMessage(new TranslatableText("tools.rift_miss"), true); player.sendMessage(new TranslatableText("tools.rift_miss"), true);
DetachedRiftBlockEntityRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor; RiftBlockEntity.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor;
} }
return new TypedActionResult<>(ActionResult.FAIL, stack); return new TypedActionResult<>(ActionResult.FAIL, stack);
} }

4
src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java
View file

@ -5,7 +5,7 @@ import java.util.Objects;
import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity; import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.client.DetachedRiftBlockEntityRenderer; import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.sound.ModSoundEvents; import org.dimdev.dimdoors.sound.ModSoundEvents;
import net.minecraft.client.item.TooltipContext; import net.minecraft.client.item.TooltipContext;
@ -47,7 +47,7 @@ public class RiftRemoverItem extends Item {
if (world.isClient) { if (world.isClient) {
if (!RaycastHelper.hitsDetachedRift(hit, world)) { if (!RaycastHelper.hitsDetachedRift(hit, world)) {
player.sendMessage(new TranslatableText("tools.rift_miss"), true); player.sendMessage(new TranslatableText("tools.rift_miss"), true);
DetachedRiftBlockEntityRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor; RiftBlockEntity.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor;
} }
return new TypedActionResult<>(ActionResult.FAIL, stack); return new TypedActionResult<>(ActionResult.FAIL, stack);
} }

4
src/main/java/org/dimdev/dimdoors/item/RiftStabilizerItem.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity; import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.client.DetachedRiftBlockEntityRenderer; import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.sound.ModSoundEvents; import org.dimdev.dimdoors.sound.ModSoundEvents;
import net.minecraft.client.item.TooltipContext; import net.minecraft.client.item.TooltipContext;
@ -40,7 +40,7 @@ public class RiftStabilizerItem extends Item {
return new TypedActionResult<>(ActionResult.SUCCESS, stack); return new TypedActionResult<>(ActionResult.SUCCESS, stack);
} else { } else {
player.sendMessage(new TranslatableText("tools.rift_miss"), true); player.sendMessage(new TranslatableText("tools.rift_miss"), true);
DetachedRiftBlockEntityRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor; RiftBlockEntity.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.INSTANCE.getGraphicsConfig().highlightRiftCoreFor;
return new TypedActionResult<>(ActionResult.FAIL, stack); return new TypedActionResult<>(ActionResult.FAIL, stack);
} }
} }