Skip to content

Commit

Permalink
修正部分问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@TartaricAcid
TartaricAcid committed Dec 19, 2023
1 parent cc9861b commit b1445d2
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 39 deletions.
3 changes: 3 additions & 0 deletions ...ub/tartaricacid/touhoulittlemaid/client/renderer/tileentity/TileEntityGomokuRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ private void renderChessboard(TileEntityGomoku gomoku, PoseStack poseStack, Mult
poseStack.translate(0.5, 1.5, 0.5);
poseStack.mulPose(Axis.ZN.rotationDegrees(180));
poseStack.mulPose(Axis.YN.rotationDegrees(facing.get2DDataValue() * 90));
if (facing == Direction.SOUTH || facing == Direction.NORTH) {
poseStack.mulPose(Axis.YN.rotationDegrees(180));
}
VertexConsumer checkerBoardBuff = bufferIn.getBuffer(RenderType.entityTranslucent(CHECKER_BOARD_TEXTURE));
CHECKER_BOARD_MODEL.renderToBuffer(poseStack, checkerBoardBuff, combinedLightIn, combinedOverlayIn, 1.0F, 1.0F, 1.0F, 1.0F);
poseStack.popPose();
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/BigBackpack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.BigBackpackContainer;
import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
import com.github.tartaricacid.touhoulittlemaid.item.ItemMaidBackpack;
import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.EntityModel;
Expand All @@ -36,16 +35,18 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
@Override
public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
Item item = stack.getItem();
if (item instanceof ItemMaidBackpack) {
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
}
if (item == InitItems.MAID_BACKPACK_MIDDLE.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.MIDDLE_CAPACITY);
}
} else {
this.dropAllItems(maid);
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
return;
}
if (item == InitItems.MAID_BACKPACK_MIDDLE.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.MIDDLE_CAPACITY);
return;
}
if (item == InitItems.MAID_BACKPACK_BIG.get()) {
return;
}
this.dropAllItems(maid);
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions .../java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/CraftingTableBackpack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.CraftingTableBackpackContainer;
import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
import com.github.tartaricacid.touhoulittlemaid.item.ItemMaidBackpack;
import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.EntityModel;
Expand All @@ -35,13 +34,14 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
@Override
public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
Item item = stack.getItem();
if (item instanceof ItemMaidBackpack) {
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
}
} else {
this.dropAllItems(maid);
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
return;
}
if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
return;
}
this.dropAllItems(maid);
}

@Override
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/FurnaceBackpack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.FurnaceBackpackContainer;
import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
import com.github.tartaricacid.touhoulittlemaid.item.ItemMaidBackpack;
import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.EntityModel;
Expand All @@ -38,19 +37,21 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {

@Override
public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
Item item = stack.getItem();
if (item instanceof ItemMaidBackpack) {
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
}
} else {
this.dropAllItems(maid);
}
IBackpackData backpackData = maid.getBackpackData();
if (backpackData instanceof FurnaceBackpackData furnaceBackpackData) {
InvWrapper inv = new InvWrapper(furnaceBackpackData);
ItemsUtil.dropEntityItems(maid, inv);
}

Item item = stack.getItem();
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
return;
}
if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
return;
}
this.dropAllItems(maid);
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/MiddleBackpack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.MiddleBackpackContainer;
import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
import com.github.tartaricacid.touhoulittlemaid.item.ItemMaidBackpack;
import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
Expand Down Expand Up @@ -37,13 +36,14 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
@Override
public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
Item item = stack.getItem();
if (item instanceof ItemMaidBackpack) {
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
}
} else {
this.dropAllItems(maid);
if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
return;
}
if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
return;
}
this.dropAllItems(maid);
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/SmallBackpack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.SmallBackpackContainer;
import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
import com.github.tartaricacid.touhoulittlemaid.item.ItemMaidBackpack;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.geom.EntityModelSet;
Expand All @@ -34,9 +33,11 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {

@Override
public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
if (!(stack.getItem() instanceof ItemMaidBackpack)) {
this.dropAllItems(maid);
Item item = stack.getItem();
if (item == InitItems.MAID_BACKPACK_SMALL.get() || item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
return;
}
this.dropAllItems(maid);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/init/InitItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public final class InitItems {
public static RegistryObject<Item> MAID_BACKPACK_SMALL = ITEMS.register("maid_backpack_small", ItemMaidBackpack::new);
public static RegistryObject<Item> MAID_BACKPACK_MIDDLE = ITEMS.register("maid_backpack_middle", ItemMaidBackpack::new);
public static RegistryObject<Item> MAID_BACKPACK_BIG = ITEMS.register("maid_backpack_big", ItemMaidBackpack::new);
public static RegistryObject<Item> CRAFTING_TABLE_BACKPACK = ITEMS.register("crafting_table_backpack", ItemMaidBackpack::new);
public static RegistryObject<Item> ENDER_CHEST_BACKPACK = ITEMS.register("ender_chest_backpack", ItemMaidBackpack::new);
public static RegistryObject<Item> FURNACE_BACKPACK = ITEMS.register("furnace_backpack", ItemMaidBackpack::new);
public static RegistryObject<Item> CHAIR = ITEMS.register("chair", ItemChair::new);
public static RegistryObject<Item> HAKUREI_GOHEI = ITEMS.register("hakurei_gohei", ItemHakureiGohei::new);
public static RegistryObject<Item> MAID_BED = ITEMS.register("maid_bed", ItemMaidBed::new);
Expand Down Expand Up @@ -50,9 +53,6 @@ public final class InitItems {
public static RegistryObject<Item> GOMOKU = ITEMS.register("gomoku", () -> new BlockItem(InitBlocks.GOMOKU.get(), new Item.Properties()));
public static RegistryObject<Item> RED_FOX_SCROLL = ITEMS.register("red_fox_scroll", ItemFoxScroll::new);
public static RegistryObject<Item> WHITE_FOX_SCROLL = ITEMS.register("white_fox_scroll", ItemFoxScroll::new);
public static RegistryObject<Item> CRAFTING_TABLE_BACKPACK = ITEMS.register("crafting_table_backpack", () -> new Item((new Item.Properties()).stacksTo(1)));
public static RegistryObject<Item> ENDER_CHEST_BACKPACK = ITEMS.register("ender_chest_backpack", () -> new Item((new Item.Properties()).stacksTo(1)));
public static RegistryObject<Item> FURNACE_BACKPACK = ITEMS.register("furnace_backpack", () -> new Item((new Item.Properties()).stacksTo(1)));
public static RegistryObject<Item> KEYBOARD = ITEMS.register("keyboard", () -> new BlockItem(InitBlocks.KEYBOARD.get(), new Item.Properties()));
public static RegistryObject<Item> BOOKSHELF = ITEMS.register("bookshelf", () -> new BlockItem(InitBlocks.BOOKSHELF.get(), new Item.Properties()));
public static RegistryObject<Item> COMPUTER = ITEMS.register("computer", () -> new BlockItem(InitBlocks.COMPUTER.get(), new Item.Properties()));
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/github/tartaricacid/touhoulittlemaid/item/ItemFilm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ private static void removeMaidSomeData(CompoundTag nbt) {
nbt.remove("HurtTime");
nbt.remove("DeathTime");
nbt.remove("HurtByTimestamp");
nbt.remove("Pos");
nbt.remove("Motion");
nbt.remove("FallDistance");
nbt.remove("Fire");
nbt.remove("Air");
nbt.remove("TicksFrozen");
nbt.remove("HasVisualFire");
nbt.remove("Passengers");
}

@Override
Expand Down

0 comments on commit b1445d2

Please sign in to comment.