Andrew71/Tardim-In-Control
1
0
Fork 0
Code Issues 5 Pull requests Projects 1 Releases Packages Wiki Activity

Okay fine I'll stop quoting Heaven Sent

Browse source
This commit is contained in:
Andrew-71 2023-06-17 22:10:20 +03:00
parent 48d214a0ee
commit d23f20c0f8
18 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java
View file

@ -16,7 +16,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import su.a71.tardim_ic.tardim_ic.blocks.food_machine.FoodMachineBlock;
import su.a71.tardim_ic.tardim_ic.blocks.food_machine.FoodMachineTileEntity;
import su.a71.tardim_ic.tardim_ic.jammer.LocationJammerMaterial;
import su.a71.tardim_ic.tardim_ic.jammer.PersonalJammerMaterial;
import su.a71.tardim_ic.tardim_ic.blocks.redstone_input.RedstoneInputBlock;
import su.a71.tardim_ic.tardim_ic.blocks.redstone_input.RedstoneInputTileEntity;
import su.a71.tardim_ic.tardim_ic.registration.CommandInit;
@ -51,12 +51,12 @@ public class Registration {
public static final ResourceLocation CLOISTER_SOUND = new ResourceLocation("tardim_ic:cloister");
public static SoundEvent CLOISTER_SOUND_EVENT = new SoundEvent(CLOISTER_SOUND);
public static final ArmorMaterial LOCATION_JAMMER_MATERIAL = new LocationJammerMaterial();
public static final Item LOCATION_JAMMER = new ArmorItem(LOCATION_JAMMER_MATERIAL, EquipmentSlot.CHEST, new Item.Properties().tab(TARDIM_IC_TAB));
public static final ArmorMaterial PERSONAL_JAMMER_MATERIAL = new PersonalJammerMaterial();
public static final Item PERSONAL_JAMMER = new ArmorItem(PERSONAL_JAMMER_MATERIAL, EquipmentSlot.CHEST, new Item.Properties().tab(TARDIM_IC_TAB));
// Register our stuff
public static void register() {
Registry.register(Registry.ITEM, new ResourceLocation(Constants.MOD_ID, "location_jammer"), LOCATION_JAMMER);
Registry.register(Registry.ITEM, new ResourceLocation(Constants.MOD_ID, "personal_jammer"), PERSONAL_JAMMER);
if (FabricLoader.getInstance().isModLoaded("computercraft")) {
ComputerCraftCompat.register(); // Register ComputerCraft-related features

19
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/blocks/food_machine/FoodMachineTileEntity.java
View file

@ -2,6 +2,8 @@ package su.a71.tardim_ic.tardim_ic.blocks.food_machine;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
@ -10,11 +12,11 @@ import su.a71.tardim_ic.tardim_ic.Registration;
import java.util.UUID;
public class FoodMachineTileEntity extends BlockEntity {
public boolean isPowered = false;
public UUID lastPlayer = null;
public int curr_food_index;
public FoodMachineTileEntity(BlockPos pos, BlockState state) {
super(Registration.REDSTONE_TARDIM_INPUT_TILEENTITY, pos, state);
super(Registration.FOOD_MACHINE_TILEENTITY, pos, state);
this.curr_food_index = 0;
}
public BlockPos getPos() {
@ -24,17 +26,16 @@ public class FoodMachineTileEntity extends BlockEntity {
@Override
public void saveAdditional(CompoundTag tag) {
tag.putBoolean("is_powered", isPowered);
if (lastPlayer != null) {
tag.putUUID("last_player", lastPlayer);
}
tag.putInt("curr_food_index", curr_food_index);
//tag.putBoolean("is_powered", isPowered);
super.saveAdditional(tag);
}
@Override
public void load(CompoundTag tag) {
super.load(tag);
isPowered = tag.getBoolean("is_powered");
lastPlayer = tag.getUUID("last_player");
curr_food_index = tag.getInt("curr_food_index");
//lastPlayer = tag.getUUID("last_player");
//event.addListener(new FuelMapReloadListener(GSON, "tardim_fuel"));
}
}

4
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java
View file

@ -37,7 +37,7 @@ import net.minecraft.world.phys.Vec3;
import su.a71.tardim_ic.tardim_ic.Registration;
import su.a71.tardim_ic.tardim_ic.computercraft_compat.FakeTardimPeripheralTileEntity;
import su.a71.tardim_ic.tardim_ic.utils.FakePlayer;
import static su.a71.tardim_ic.tardim_ic.Registration.LOCATION_JAMMER;
import static su.a71.tardim_ic.tardim_ic.Registration.PERSONAL_JAMMER;
import javax.annotation.Nonnull;
import java.util.*;
@ -326,7 +326,7 @@ public class DigitalInterfacePeripheral extends TardimPeripheral implements IPer
}
for (ItemStack armour : player.getArmorSlots()) {
if (armour.is(LOCATION_JAMMER)) {
if (armour.is(PERSONAL_JAMMER)) {
throw new LuaException("Player location jammed");
};
}

4
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/jammer/LocationJammerMaterial.java → Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/jammer/PersonalJammerMaterial.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import org.jetbrains.annotations.NotNull;
public class LocationJammerMaterial implements ArmorMaterial {
public class PersonalJammerMaterial implements ArmorMaterial {
private static final int[] BASE_DURABILITY = new int[] {13, 15, 16, 11};
private static final int[] PROTECTION_VALUES = new int[] {1, 1, 1, 1};
@ -41,7 +41,7 @@ public class LocationJammerMaterial implements ArmorMaterial {
@Override
public @NotNull String getName() {
// Must be all lowercase
return "location jammer";
return "personal_jammer";
}
@Override

2
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/mixin/JammerMixin.java
View file

@ -18,7 +18,7 @@ import su.a71.tardim_ic.tardim_ic.registration.CommandInit;
import static com.swdteam.tardim.common.command.tardim.CommandTardimBase.sendResponse;
import static su.a71.tardim_ic.tardim_ic.Constants.LOG;
import static su.a71.tardim_ic.tardim_ic.Registration.LOCATION_JAMMER;
import static su.a71.tardim_ic.tardim_ic.Registration.PERSONAL_JAMMER;
@Mixin(value = CommandLocate.class, remap = false)
public class JammerMixin {

2
Fabric/src/main/resources/fabric.mod.json
View file

@ -4,7 +4,7 @@
"version": "${version}",
"name": "Tardim: In Control",
"description": "All of time and space, now automated. Control your TARDIM using ComputerCraft: Tweaked.",
"description": "All of time and space, now automated and improved. This mod aims to make TARDIM even better.",
"authors": [
"Andrew_7_1"
],